Fixup original NTA