Fixed #1523
Merge pull request #1524 from umpirsky/fix/issue-1523

Fixed #1523