Trying to fix heroku bug