Fix for ROOT-6393