Fix for ROOT-6458 (3)