improve the previous fix for import_cmd slightly