Fixed bugs for the import part .