diff --git a/PerfectNumbers.Core/MersenneDivisorCycles.cs b/PerfectNumbers.Core/MersenneDivisorCycles.cs
index a7a21a3..26ca6ed 100644
--- a/PerfectNumbers.Core/MersenneDivisorCycles.cs
+++ b/PerfectNumbers.Core/MersenneDivisorCycles.cs
@@ -807,7 +807,7 @@ public class MersenneDivisorCycles
                                 divisor,
                                 previousOrder: null,
                                 PrimeOrderCalculator.PrimeOrderSearchConfig.HeuristicDefault);
-                        if (orderResult.Status == PrimeOrderCalculator.PrimeOrderStatus.Found && orderResult.Order != 0UL)
+                        if (orderResult.Order != 0UL)
                         {
                                 return orderResult.Order;
                         }
diff --git a/PerfectNumbers.Core/PrimeOrderCalculator.cs b/PerfectNumbers.Core/PrimeOrderCalculator.cs
index 24acb4b..d361f5c 100644
--- a/PerfectNumbers.Core/PrimeOrderCalculator.cs
+++ b/PerfectNumbers.Core/PrimeOrderCalculator.cs
@@ -98,7 +98,7 @@ internal static class PrimeOrderCalculator
             return new PrimeOrderResult(PrimeOrderStatus.Found, order);
         }
 
-        return new PrimeOrderResult(PrimeOrderStatus.HeuristicUnresolved, 0UL);
+        return FinishStrictly(prime, config.Mode);
     }
 
     private static PrimeOrderResult FinishStrictly(ulong prime, PrimeOrderMode mode)