Better fix for matchField