Fixing what was fucked up from Jeremy's fuck up