Another try to make this run on heroku