3rd try to fix heroku issues