Workaround for Heroku