Make it work in heroku