Hopefully a fix for heroku