Fixing heroku issue