Fix for Issue #721
Merge pull request #734 from wyhmichael/1.8

Fix for Issue #721