Second part of the fix for ROOT-6194