Pass address of pointer, not value
Merge pull request #6555 from wmtan/PassAddressOfPointer

Pass address of pointer, not value, again