Made Ctrl-V importer work more robust.