Fixed Heroku Compatibility