removed some debug code, stronger test reveals some issues