This is addressed by the improvement implemented in https://totara.community/local/publictracker/issuedetail.php?key=TL-35005 and will be included in the v.17 release.