Fixing Heroku Bug