revised fixup