solves additional problem of issue #79
Merge pull request #86 from kshileev/issue79

solves additional problem of issue #79