Try #2 to fix Heroku issue