Added fix for heroku