Fix for ROOT-5934