Fix for the issue 8582