Fixed bad assumption of !Stationary => GPS