also fix stationpair