A little less debugging