diff --git a/umskt/src/bink2002.rs b/umskt/src/bink2002.rs
index b5cea35..8e182b9 100644
--- a/umskt/src/bink2002.rs
+++ b/umskt/src/bink2002.rs
@@ -186,9 +186,12 @@ impl ProductKey {
 
             s = &s + &c;
 
-            if mod_sqrt(&s, gen_order).is_none() {
-                no_square = true;
-            };
+            match mod_sqrt(&s, gen_order) {
+                Some(res) => s = res,
+                None => {
+                    no_square = true;
+                }
+            }
 
             s = (s - e).mod_floor(gen_order);