Fixing to work with heroku