Fix matching on masked fields