Fix on Heroku