Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/data/PTRouteSegment.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/data/PTRouteSegment.java	(revision 33386)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/data/PTRouteSegment.java	(revision 33387)
@@ -149,5 +149,5 @@
             if (listsEqual) {
                 for (int i = 0; i < thisWays.size(); i++) {
-                    if (thisWays.get(i).getId() != otherWays.get(i).getId()) {
+                    if (thisWays.get(i).getUniqueId() != otherWays.get(i).getUniqueId()) {
                         listsEqual = false;
                         break;
@@ -187,4 +187,7 @@
     public boolean equalsRouteSegment(PTRouteSegment other) {
 
+//    	if(!firstStop.equalsStop(firstStop) || !lastStop.equalsStop(other.lastStop))
+//    		return false;
+
         List<Way> thisWays = new ArrayList<>();
         for (PTWay ptway : this.ptways) {
@@ -201,5 +204,5 @@
 
         for (int i = 0; i < thisWays.size(); i++) {
-            if (thisWays.get(i).getId() != otherWays.get(i).getId()) {
+            if (thisWays.get(i).getUniqueId() != otherWays.get(i).getUniqueId()) {
                 return false;
             }
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentChecker.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentChecker.java	(revision 33386)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/SegmentChecker.java	(revision 33387)
@@ -330,5 +330,6 @@
 				primitives.add(relation);
 				List<OsmPrimitive> highlighted = new ArrayList<>();
-				highlighted.addAll(wronglySortedPtway.getWays());
+				highlighted.add(startStop.getStopPosition());
+				highlighted.add(endStop.getStopPosition());
 				Builder builder = TestError.builder(this.test, Severity.WARNING,
 						PTAssistantValidatorTest.ERROR_CODE_STOP_BY_STOP);
@@ -664,6 +665,6 @@
 			List<PTRouteSegment> correctSegmentsForThisError = new ArrayList<>();
 			for (PTRouteSegment segment : correctSegments) {
-				if (wrongSegment.getFirstWay().getId() == segment.getFirstWay().getId()
-						&& wrongSegment.getLastWay().getId() == segment.getLastWay().getId()) {
+				if (wrongSegment.getFirstWay().getUniqueId() == segment.getFirstWay().getUniqueId()
+						&& wrongSegment.getLastWay().getUniqueId() == segment.getLastWay().getUniqueId()) {
 					correctSegmentsForThisError.add(segment);
 				}
@@ -794,6 +795,6 @@
 		List<PTRouteSegment> correctSegmentsForThisError = new ArrayList<>();
 		for (PTRouteSegment segment : correctSegments) {
-			if (wrongSegment.getFirstWay().getId() == segment.getFirstWay().getId()
-					&& wrongSegment.getLastWay().getId() == segment.getLastWay().getId()) {
+			if (wrongSegment.getFirstWay().getUniqueId() == segment.getFirstWay().getUniqueId()
+					&& wrongSegment.getLastWay().getUniqueId() == segment.getLastWay().getUniqueId()) {
 				correctSegmentsForThisError.add(segment);
 			}