fix Issue #121
Merge pull request #593 from vkn/Issue-121

fix Issue #121