Fix for nonce

Hack to prevent duplicates nonces