diff --git a/armsrc/crypto1.c b/armsrc/crypto1.c
index b218af19e..a212ecc4c 100644
--- a/armsrc/crypto1.c
+++ b/armsrc/crypto1.c
@@ -24,6 +24,7 @@
 void crypto1_create(struct Crypto1State *s, uint64_t key)
 {
 //	struct Crypto1State *s = malloc(sizeof(*s));
+	s->odd = s->even = 0;
 	int i;
 
 	for(i = 47;s && i > 0; i -= 2) {
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 95a6f8d7f..e2d6da74e 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -687,6 +687,7 @@ static void Check_for_FilterFlipProperties(void)
 static void simulate_MFplus_RNG(uint32_t test_cuid, uint64_t test_key, uint32_t *nt_enc, uint8_t *par_enc)
 {
 	struct Crypto1State sim_cs;
+	sim_cs.odd = sim_cs.even = 0;
 
 	// init cryptostate with key:
 	for(int8_t i = 47; i > 0; i -= 2) {
diff --git a/client/nonce2key/crypto1.c b/client/nonce2key/crypto1.c
index f6779a189..e5a3fe73d 100644
--- a/client/nonce2key/crypto1.c
+++ b/client/nonce2key/crypto1.c
@@ -23,6 +23,7 @@
 struct Crypto1State * crypto1_create(uint64_t key)
 {
 	struct Crypto1State *s = malloc(sizeof(*s));
+	s->odd = s->even = 0;	
 	int i;
 
 	for(i = 47;s && i > 0; i -= 2) {
diff --git a/tools/mfkey/crypto1.c b/tools/mfkey/crypto1.c
index d15a40e31..57a6c1df9 100755
--- a/tools/mfkey/crypto1.c
+++ b/tools/mfkey/crypto1.c
@@ -23,6 +23,7 @@
 struct Crypto1State * crypto1_create(uint64_t key)
 {
 	struct Crypto1State *s = malloc(sizeof(*s));
+	s->odd = s->even = 0;	
 	int i;
 
 	for(i = 47;s && i > 0; i -= 2) {
diff --git a/tools/nonce2key/crypto1.c b/tools/nonce2key/crypto1.c
index d15a40e31..57a6c1df9 100644
--- a/tools/nonce2key/crypto1.c
+++ b/tools/nonce2key/crypto1.c
@@ -23,6 +23,7 @@
 struct Crypto1State * crypto1_create(uint64_t key)
 {
 	struct Crypto1State *s = malloc(sizeof(*s));
+	s->odd = s->even = 0;	
 	int i;
 
 	for(i = 47;s && i > 0; i -= 2) {