Fix ROOT-6350