Fixes bug: 1267526
Merge pull request #77 from ikhudoshyn/bug/1267526

Fixes bug: 1267526