fixup! r