Fixed the import bugs