Fixed issue #1549
Merge pull request #1550 from umpirsky/fix/issue-1549

Fixed issue #1549