Fix for issue 8002