Fix https://sft.its.cern.ch/jira/browse/ROOT-6303