code reorganization fix.