fix the import issues