Make it work on heroku