Put some debug in the right place