Fix a module import problem with previous commit