diff --git a/src/main/java/org/opentripplanner/routing/impl/HSLFareServiceImpl.java b/src/main/java/org/opentripplanner/routing/impl/HSLFareServiceImpl.java
index d7c0cac59ce..c07a2542f15 100644
--- a/src/main/java/org/opentripplanner/routing/impl/HSLFareServiceImpl.java
+++ b/src/main/java/org/opentripplanner/routing/impl/HSLFareServiceImpl.java
@@ -27,6 +27,7 @@ the License, or (at your option) any later version.
 import org.opentripplanner.routing.core.FareRuleSet;
 import org.opentripplanner.routing.core.State;
 import org.opentripplanner.routing.edgetype.HopEdge;
+import org.opentripplanner.routing.edgetype.TransitBoardAlight;
 import org.opentripplanner.routing.graph.Edge;
 import org.opentripplanner.routing.spt.GraphPath;
 import org.opentripplanner.routing.impl.DefaultFareServiceImpl;
@@ -50,10 +51,13 @@ protected List<Ride> createRides(GraphPath path) {
         boolean newRide = true;
         for (State state : path.states) {
             Edge edge = state.getBackEdge();
-            if (!(edge instanceof HopEdge)) {
+            if (edge instanceof TransitBoardAlight) {
                 newRide = true;
                 continue;
             }
+            if (!(edge instanceof HopEdge)) {
+                continue;
+            }
             HopEdge hEdge = (HopEdge) edge;
             if (newRide == true) {
                 ride = new Ride();