Fixed masking issue