S2 inverted on T+ (Fix #1716)