Heroku fix until after work