Fix for ROOT-6464