I don't think this change is okay. Is this necessary for the other changes?