Fixed bug that incorrectly handled system origyn for W/S positions.