Maybe fix crash on heroku