Really fix them now