18th commit - heroku fix-2