ROOT-related fix added