Fixed for heroku crash