I think this introduced a terrible bug