Workaround for ROOT6 limitation
Merge pull request #1843 from wmtan/WorkaroundForROOT6Limitation

Workaround for ROOT6 limitation