Fail fixup