2nd Heroku fix