Fix ROOT-6470