fixed #139
Merge pull request #145 from baev/#139-bug-fix

fixed #139