Added in heroku workaround