Improve tangent points (same as in unstable)