More debug... and a fix?