Fixing for heroku 2