Fix for ROOT-6194 and ROOT-6164
Fix for ROOT-6194 and ROOT-6164

kirbyherm/root-r-tools,tc3t/qoot,tc3t/qoot,kirbyherm/root-r-tools,kirbyherm/root-r-tools,tc3t/qoot,tc3t/qoot,kirbyherm/root-r-tools,tc3t/qoot,tc3t/qoot,kirbyherm/root-r-tools,tc3t/qoot,tc3t/qoot,kirbyherm/root-r-tools,kirbyherm/root-r-tools,tc3t/qoot,tc3t/qoot