Take some debug code out :-)