Work around heroku maybe