Fixed heroku support