Final fix for Heroku