Fix for ROOT-6442