The previous fix of widening divides that trap was too fragile as it depends on custom