fixes duplicate nonce usage issues