introduced a new bug that doesnt get the right stopId's