remove field masking issues