Fix for ROOT-6850