Fixed behavior for heroku