Fix masking for column names