Attempt to fix for Heroku