Complete the fix for ROOT-6442