Corrected fix for #1703.
Merge pull request #1734 from pjackson28/v3.0

Corrected fix for #1703