Fix for ROOT-6208