Heroku-safe version