diff --git a/CSA.java b/CSA.java
index 737c542..b56f0ec 100644
--- a/CSA.java
+++ b/CSA.java
@@ -59,7 +59,7 @@ void main_loop(int arrival_station) {
                 if(connection.arrival_station == arrival_station) {
                     earliest = Math.min(earliest, connection.arrival_timestamp);
                 }
-            } else if(connection.arrival_timestamp > earliest) {
+            } else if(connection.departure_timestamp >= earliest) {
                 return;
             }
         }
diff --git a/csa.c b/csa.c
index 4af4923..35e33d9 100644
--- a/csa.c
+++ b/csa.c
@@ -91,7 +91,7 @@ void compute_route(array_of(connection) *timetable, request *rq)
             if(c->to == rq->to) {
                 earliest = MIN(earliest, c->end);
             }
-        } else if(c->end > earliest) {
+        } else if(c->start >= earliest) {
             break;
         }
     }
diff --git a/csa.cc b/csa.cc
index 6a9fb62..4d9969e 100644
--- a/csa.cc
+++ b/csa.cc
@@ -57,7 +57,7 @@ struct CSA {
                 if(connection.arrival_station == arrival_station) {
                     earliest = std::min(earliest, connection.arrival_timestamp);
                 }
-            } else if(connection.arrival_timestamp > earliest) {
+            } else if(connection.departure_timestamp >= earliest) {
               return;
             }
         }
diff --git a/csa.hs b/csa.hs
index 1cafcf6..698e57b 100644
--- a/csa.hs
+++ b/csa.hs
@@ -75,7 +75,7 @@ augmentTimetable earliestArrival timetable@(Timetable arrivalTimes inConnections
           newTimetable     = Timetable newArrivalTimes newInConnections
       in augmentTimetable (min arrivalTime earliestArrival) newTimetable connections
     else
-      if arrivalTime > earliestArrival
+      if departureTime >= earliestArrival
       then
         timetable
       else
diff --git a/csa.lua b/csa.lua
index 876cb99..fa13e84 100755
--- a/csa.lua
+++ b/csa.lua
@@ -40,7 +40,7 @@ function find(connections, earliest_arr, in_conn,  arr)
       if cas == arr then
         earliest = math.min(earliest, cat)
       end
-    elseif cat > earliest then
+    elseif cdt >= earliest then
       return
     end
   end
diff --git a/csa.pas b/csa.pas
index 8bbdc55..3914aab 100644
--- a/csa.pas
+++ b/csa.pas
@@ -42,7 +42,7 @@ procedure mainLoop(arrivalStation: Longword);
       if (timetable[i].arrivalStation = arrivalStation) then
         earliest := min(timetable[i].arrivalTime, earliest);
     end
-    else if (timetable[i].arrivalTime > earliest) then
+    else if (timetable[i].departureTime >= earliest) then
       Exit;
   end;
 end;
diff --git a/csa.py b/csa.py
index 2f65278..c412bdb 100755
--- a/csa.py
+++ b/csa.py
@@ -46,7 +46,7 @@ def main_loop(self, arrival_station):
 
                 if c.arrival_station == arrival_station:
                     earliest = min(earliest, c.arrival_timestamp)
-            elif c.arrival_timestamp > earliest:
+            elif c.departure_timestamp >= earliest:
                 return
 
     def print_result(self, arrival_station):
diff --git a/csa.rb b/csa.rb
index 4531f5f..7fe47ee 100755
--- a/csa.rb
+++ b/csa.rb
@@ -48,7 +48,7 @@ def main_loop(arrival_station)
         if c.arrival_station == arrival_station
           earliest = [earliest, c.arrival_timestamp].min
         end
-      elsif c.arrival_timestamp > earliest
+      elsif c.departure_timestamp >= earliest
         return
       end
     end
diff --git a/csa.rs b/csa.rs
index 064be62..d341763 100644
--- a/csa.rs
+++ b/csa.rs
@@ -36,7 +36,7 @@ fn csa_main_loop(timetable: &[Connection], arrival_station: usize, earliest_arri
             if connection.arrival_station == arrival_station && connection.arrival_timestamp < earliest {
                 earliest = connection.arrival_timestamp;
             }
-        } else if connection.arrival_timestamp > earliest {
+        } else if connection.departure_timestamp >= earliest {
             break;
         }
     }