Another desperate patch to make that heroku shit working