More debug, and probably actually fix the problem