Fixed issue with not checking multiple matches