move importer more robust