Fixed heroku compatibility