Simplify the fixup handler