Potential Heroku Fix