Fix for ROOT-5337