fix the importer to work with both variants of modes