Fixing Heroku issue