Fix for Heroku 2