Fixed the issue 11116