Fix bad import after some refactoring