fixed issue #661

bug
Merge pull request #680 from safiyu/issue2

fixed issue #661