fix issue #638
Merge pull request #693 from qinerg/master

fix issue #638