final fixup for NCHK-2864