Fixed running on Heroku