Fix to work on Heroku