Permanent solution to temporary problem