bug fixing for heroku