Trying to fix this thing for heroku's sake