new nonce fixup