diff --git a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
index 387999b2..83fc6526 100644
--- a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
+++ b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
@@ -195,13 +195,6 @@ public class DetectedOperationService : IDetectedOperationService
 
         var timeZone = telemetryService.GetTimezone(idTelemetry);
 
-        if (telemetries.Count() <= gap)
-        {
-            var lastTelemetry = telemetries.Last();
-            var lastDateTelemetry = new DateTimeOffset(lastTelemetry.DateTime, timeZone.Offset);
-            return (lastDateTelemetry, Enumerable.Empty<DetectedOperationDto>());
-        }
-
         var detectedOperations = new List<DetectedOperationDto>();
 
         var detectableTelemetries = telemetries
@@ -219,6 +212,13 @@ public class DetectedOperationService : IDetectedOperationService
                 RotorSpeed = t.RotorSpeed,
                 AxialLoad = t.AxialLoad,
             }).ToArray();
+        
+        if (detectableTelemetries.Length <= gap)
+        {
+            var lastTelemetry = telemetries.Last();
+            var lastDateTelemetry = new DateTimeOffset(lastTelemetry.DateTime, timeZone.Offset);
+            return (lastDateTelemetry, Enumerable.Empty<DetectedOperationDto>());
+        }
 
         var positionBegin = 0;
         var positionEnd = detectableTelemetries.Length - gap;
@@ -238,8 +238,9 @@ public class DetectedOperationService : IDetectedOperationService
             }
 
             var point0 = detectableTelemetries[positionBegin];
-            while (positionBegin < positionEnd && IsChangingTelemetryInterval(point0, detectableTelemetries[++positionBegin]))
-            ;
+            
+            while (positionBegin < positionEnd && IsChangingTelemetryInterval(point0, detectableTelemetries[positionBegin]))
+                positionBegin++;
         }
 
         return (detectableTelemetries[positionBegin].DateTime, detectedOperations);