Fix for ROOT-5280