Fixed issue 11155
Merge pull request #2709 from jerro/fix-11155

Fixed issue 11155