Fixing Heroku bug