Fix computeFirstMatch bound all