diff --git a/rtl/src/main/pascal/Generics.Collections.pas b/rtl/src/main/pascal/Generics.Collections.pas
index 22c1419..19ea059 100644
--- a/rtl/src/main/pascal/Generics.Collections.pas
+++ b/rtl/src/main/pascal/Generics.Collections.pas
@@ -141,10 +141,9 @@ begin
     if Ptr^ = Key then
     begin
       Result := I;
-      I      := Self.FCount  { force loop exit }
-    end
-    else
-      I := I + 1
+      break
+    end;
+    I := I + 1
   end
 end;
 
diff --git a/tests/phase3_milestone.pas b/tests/phase3_milestone.pas
index 1db7b23..8006ba7 100644
--- a/tests/phase3_milestone.pas
+++ b/tests/phase3_milestone.pas
@@ -118,10 +118,9 @@ begin
     if Ptr^ = Key then
     begin
       Result := I;
-      I      := Self.FCount
-    end
-    else
-      I := I + 1
+      break
+    end;
+    I := I + 1
   end
 end;