Fix for issue-649
Merge pull request #653 from wyhmichael/1.7

Fix for issue-649