Fix the import order