Correct for poles and -180/180 straddling