Fixing a bug where nonce's weren't being saved