Fix for issue 707
Merge pull request #709 from wyhmichael/1.8

Fix for issue 707