Fix to run in heroku