attempt to make heroku-compatible