Heroku workaround