Fixed issue #1154
Merge pull request #1156 from umpirsky/fix/issue-1154

Fixed issue #1154