Fixing nonce issue