2.1.0.5 (change conditions for re-anchoring)