[Debug] tweak for #6474