diff --git a/src/all_cases/all_cases.cc b/src/all_cases/all_cases.cc
index 4639c4f..1b8e779 100644
--- a/src/all_cases/all_cases.cc
+++ b/src/all_cases/all_cases.cc
@@ -17,7 +17,7 @@ AllCases::Status AllCases::status() { // get all cases status
 }
 
 const std::vector<uint32_t> (*AllCases::fetch())[16] { // get const ptr of all cases
-    if (all_cases->empty()) {
+    if (status() != AllCases::AVAILABLE) {
         AllCases::build(); // all cases initialize
     }
     return &all_cases; // return ptr
diff --git a/src/all_cases/basic_ranges.cc b/src/all_cases/basic_ranges.cc
index d0da21c..cca1948 100644
--- a/src/all_cases/basic_ranges.cc
+++ b/src/all_cases/basic_ranges.cc
@@ -27,7 +27,7 @@ BasicRanges::Status BasicRanges::status() { // get basic ranges status
 }
 
 const std::vector<uint32_t>* BasicRanges::fetch() { // get const ptr of basic ranges
-    if (basic_ranges.empty()) {
+    if (status() != BasicRanges::AVAILABLE) {
         BasicRanges::build(); // basic ranges initialize
     }
     return &basic_ranges; // return ptr