fixup! Do the right thing