Fix for ROOT-5889