Actually fixed for heroku this time