Fix masking issue