fixed the import bugs