Fix ROOT-6866