Updated to fix heroku bug