Bug fix for heroku