This should prevent AWS/Heroku complications