attempt to fix heroku bugs