Fix for the new Heroku stack