Heroku crash fix
Final Commit