Maybe this commit will work with Heroku