Fix for Heroku, I hope