Hack to get Heroku working better