Try to fix heroku issue 2