Fix for ROOT-6653