Fix.
Merge pull request #191 from ilya-murzinov/Issue155

Issue155 fixed.