Trying to fix for heroku