Changes how indices are incremented in the matching algorithm.
I think this fixes a race condition, but I'd appreciate additional sets of eyes @cagapopo @ascarabo @ahennequ