[fix] Applied fix to fix ROOT-6302 from ROOT master.
[fix] Applied fix to fix ROOT-6302 from ROOT master.

tc3t/qoot,tc3t/qoot,tc3t/qoot,tc3t/qoot,tc3t/qoot,tc3t/qoot,tc3t/qoot,tc3t/qoot,tc3t/qoot,tc3t/qoot