Fix var hiding bug