diff --git a/nssa/program_methods/guest/src/bin/privacy_preserving_circuit.rs b/nssa/program_methods/guest/src/bin/privacy_preserving_circuit.rs
index 181bdc9..e240b7d 100644
--- a/nssa/program_methods/guest/src/bin/privacy_preserving_circuit.rs
+++ b/nssa/program_methods/guest/src/bin/privacy_preserving_circuit.rs
@@ -54,13 +54,15 @@ fn main() {
     for i in 0..n_accounts {
         match visibility_mask[i] {
             0 => {
+                // Public account
+                public_pre_states.push(pre_states[i].clone());
+
                 let mut post = post_states[i].clone();
+                post.nonce += 1;
                 if post.program_owner == DEFAULT_PROGRAM_ID {
                     // Claim account
                     post.program_owner = program_id;
                 }
-                // Public account
-                public_pre_states.push(pre_states[i].clone());
                 public_post_states.push(post);
             }
             1 | 2 => {
diff --git a/nssa/src/privacy_preserving_transaction/circuit.rs b/nssa/src/privacy_preserving_transaction/circuit.rs
index 8bbdb79..639b31f 100644
--- a/nssa/src/privacy_preserving_transaction/circuit.rs
+++ b/nssa/src/privacy_preserving_transaction/circuit.rs
@@ -136,7 +136,8 @@ mod tests {
         let expected_sender_post = Account {
             program_owner: program.id(),
             balance: 100 - balance_to_move,
-            ..Account::default()
+            nonce: 1,
+            data: vec![],
         };
 
         let expected_recipient_post = Account {