Reduce impact of order ($i)

Isn't as important as the specificity.
Merge remote-tracking branch 'origin/patch-2'