Fix variable masking