Fix for ROOT-6183