Fix #296
Merge pull request #297 from DmitriyMX/dev-fix296

Fixed #296