Fixed issues raised in pull request #1780.
Merge pull request #1781 from pjackson28/v3.0

Fixed issues raised in pull request #1780