CurveSwitch fix