Added a bug fix for heroku