Fix match validation