References: Resolves warning issue.
Merge pull request #1459 from am11/master

References: Resolves warning issue