Fix for ROOT-6628