Quick-fix for nonce handling