minor reorganization
bugfix