Fix for Heroku (this time for real)