Bugfix for heroku