Fix for ROOT-6215