fix duplicate nonce usage issues