More debug-- following #44