Try to fix Heroku issue