Fix crash on Heroku