Fix for ROOT-6459