Fix for Heroku