Heroku fix #2, I think