Fix for issue 8582
Issue 8582