Fixed issue 11155