More debug checking