Try to improve capture ordering

Bench : 5157760