Fix for ROOT-6396