diff --git a/sources/CCordicRotateHalfPiRom/CCordicRotateHalfPiRom.hpp b/sources/CCordicRotateHalfPiRom/CCordicRotateHalfPiRom.hpp
index b995e0c..10c1af1 100644
--- a/sources/CCordicRotateHalfPiRom/CCordicRotateHalfPiRom.hpp
+++ b/sources/CCordicRotateHalfPiRom/CCordicRotateHalfPiRom.hpp
@@ -25,7 +25,7 @@ class CCordicRotateRomHalfPi {
     static_assert(TNStages > 1, "2 stages of CORDIC is the minimum.");
 
 public:
-    static constexpr const CRomGeneratorConst<TIn_W, TNStages, Tq> & rom_cordic = CRomGeneratorConst<TIn_W, TNStages, Tq>();
+    static constexpr const CRomGeneratorConst<TIn_W, TNStages, Tq> & rom_cordic{};
 
     static constexpr unsigned In_W    = TIn_W;
     static constexpr unsigned In_I    = TIn_I;
diff --git a/sources/tb/cordic_tb.cpp b/sources/tb/cordic_tb.cpp
index b09f0ec..860252d 100644
--- a/sources/tb/cordic_tb.cpp
+++ b/sources/tb/cordic_tb.cpp
@@ -317,9 +317,10 @@ TEST_CASE("ROM-based Cordic constexpr are evaluated during compilation.", "[CORD
         double results_re[n_lines];
         double results_im[n_lines];
 
-        constexpr complex<int64_t> res = cordic.cordic(value_in, angle);
-        static_assert(res == cordic.cordic(value_in, angle), "Test");
-        REQUIRE_FALSE(res == cordic.cordic(complex<int64_t>(1, 0), angle));
-        REQUIRE(res == cordic.cordic(value_in, angle));
+        constexpr complex<int64_t> res1 = cordic.cordic(value_in, angle);
+        constexpr complex<int64_t> res2 = cordic.cordic(value_in, angle);
+        static_assert(res1 == res2, "Test");
+        REQUIRE_FALSE(res1 == cordic.cordic(complex<int64_t>(1, 0), angle));
+        REQUIRE(res1 == cordic.cordic(value_in, angle));
     }
 }