Fix for ROOT-6458