Fix when handling stop when we do know whetehr it is origin or destination stop.