Fix reference issue.
Merge pull request #477 from gsn/master

Fix reference issue.