diff --git a/src/crypto/wild_keccak.h b/src/crypto/wild_keccak.h
index eb017aef..f7abaf0c 100644
--- a/src/crypto/wild_keccak.h
+++ b/src/crypto/wild_keccak.h
@@ -30,12 +30,10 @@ extern "C" {
 namespace crypto
 {
 #define OPT_XOR_4_RES(A_, B_, C_, D_, Res) \
-  crypto::hash A = A_;crypto::hash B = B_;crypto::hash C = C_; crypto::hash D = D_; \
-  ((uint64_t*)&Res)[0] = ((const uint64_t*)&A)[0] ^ ((const uint64_t*)&B)[0] ^ ((const uint64_t*)&C)[0] ^ ((const uint64_t*)&D)[0]; \
-  ((uint64_t*)&Res)[1] = ((const uint64_t*)&A)[1] ^ ((const uint64_t*)&B)[1] ^ ((const uint64_t*)&C)[1] ^ ((const uint64_t*)&D)[1]; \
-  ((uint64_t*)&Res)[2] = ((const uint64_t*)&A)[2] ^ ((const uint64_t*)&B)[2] ^ ((const uint64_t*)&C)[2] ^ ((const uint64_t*)&D)[2]; \
-  ((uint64_t*)&Res)[3] = ((const uint64_t*)&A)[3] ^ ((const uint64_t*)&B)[3] ^ ((const uint64_t*)&C)[3] ^ ((const uint64_t*)&D)[3];
-
+  ((uint64_t*)&Res)[0] = ((const uint64_t*)&A_)[0] ^ ((const uint64_t*)&B_)[0] ^ ((const uint64_t*)&C_)[0] ^ ((const uint64_t*)&D_)[0]; \
+  ((uint64_t*)&Res)[1] = ((const uint64_t*)&A_)[1] ^ ((const uint64_t*)&B_)[1] ^ ((const uint64_t*)&C_)[1] ^ ((const uint64_t*)&D_)[1]; \
+  ((uint64_t*)&Res)[2] = ((const uint64_t*)&A_)[2] ^ ((const uint64_t*)&B_)[2] ^ ((const uint64_t*)&C_)[2] ^ ((const uint64_t*)&D_)[2]; \
+  ((uint64_t*)&Res)[3] = ((const uint64_t*)&A_)[3] ^ ((const uint64_t*)&B_)[3] ^ ((const uint64_t*)&C_)[3] ^ ((const uint64_t*)&D_)[3];
 
   typedef uint64_t state_t_m[25];
   typedef uint64_t mixin_t[KK_MIXIN_SIZE];
diff --git a/tests/performance_tests/keccak_test.h b/tests/performance_tests/keccak_test.h
index 668a9873..14d0bdf3 100644
--- a/tests/performance_tests/keccak_test.h
+++ b/tests/performance_tests/keccak_test.h
@@ -111,7 +111,7 @@ public:
 #define SCR_I(i) m_scratchpad_vec[st[i]%m_scratchpad_vec.size()]
       for (size_t i = 0; i != 6; i++)
       {
-        *(crypto::hash*)&mix[i * 4] = XOR_4(SCR_I(i * 4), SCR_I(i * 4 + 1), SCR_I(i * 4 + 2), SCR_I(i * 4 + 3));
+        OPT_XOR_4_RES(SCR_I(i * 4), SCR_I(i * 4 + 1), SCR_I(i * 4 + 2), SCR_I(i * 4 + 3), *(crypto::hash*)&mix[i * 4]);
       }
     });
 
@@ -177,7 +177,7 @@ void measure_keccak_over_scratchpad()
   crypto::hash res_to_test = { 0 };
   crypto::hash res_etalon = { 0 };
   OPT_XOR_4_RES(scratchpad_vec[0], scratchpad_vec[1], scratchpad_vec[2], scratchpad_vec[3], res_to_test);
-  res_etalon = XOR_4(scratchpad_vec[0], scratchpad_vec[1], scratchpad_vec[2], scratchpad_vec[3]);
+  OPT_XOR_4_RES(scratchpad_vec[0], scratchpad_vec[1], scratchpad_vec[2], scratchpad_vec[3], res_etalon);
 
 
 // 
@@ -222,7 +222,7 @@ void measure_keccak_over_scratchpad()
     uint64_t ticks_d = epee::misc_utils::get_tick_count();
     for (size_t r = 0; r != measere_rounds; r++)
     {
-      crypto::get_wild_keccak2(has_str, res_h, 1, scratchpad_vec, i);
+      crypto::get_wild_keccak2(has_str, res_h, scratchpad_vec, i);
     }
 
     uint64_t ticks_e = epee::misc_utils::get_tick_count();