Better debug for #1783