Add finall fix for heroku