modified in order to work fine in heroku