diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java
index ecd55a4f..2fb2b9a8 100644
--- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java
+++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java
@@ -89,7 +89,11 @@ public class UpdateVehicleDependentPracticalTimeWindows implements RouteVisitor,
         vehicles = vehiclesToUpdate.get(route);
         for (Vehicle vehicle : vehicles) {
             latest_arrTimes_at_prevAct[vehicle.getVehicleTypeIdentifier().getIndex()] = vehicle.getLatestArrival();
-            location_of_prevAct[vehicle.getVehicleTypeIdentifier().getIndex()] = route.getEnd().getLocation();
+            Location location = vehicle.getEndLocation();
+            if(!vehicle.isReturnToDepot()){
+                location = route.getEnd().getLocation();
+            }
+            location_of_prevAct[vehicle.getVehicleTypeIdentifier().getIndex()] = location;
         }
     }