2nd attempt at fixing heroku bug