Further bug fix for heroku