Fixed to work with heroku