Fix opposite direction tipping deadlocks (whole 2 happenned in just 5 months)