and fix an import bug