fix import bugs after refactoring