Fixed masking w.r.t. validation