Fixed auto-importer