Fix for issue 8582