Merge "Fixing invalid variable reference"