Fix for the issue_8582