1st attempt at fixing heroku issue