made some changes to fix heroku bug