Fixing regression in AutoImport