More debug mantis #6625