Fix issue.1 in ROOT-5644