refactoring (bug hunt!)