Fix for ROOT-6459
Fix for ROOT-6459