Fix bug
Merge pull request #655 from bvssvni/master

Fix bug