Merge "Fix a pointer reference"