Compatibility with the ROOT trunk