diff --git a/src/main/groovy/io/saagie/plugin/dataops/clients/SaagieClient.groovy b/src/main/groovy/io/saagie/plugin/dataops/clients/SaagieClient.groovy
index 1bb5cd82..3efe902f 100644
--- a/src/main/groovy/io/saagie/plugin/dataops/clients/SaagieClient.groovy
+++ b/src/main/groovy/io/saagie/plugin/dataops/clients/SaagieClient.groovy
@@ -1106,9 +1106,7 @@ class SaagieClient {
 				)
 				
 				if (configuration.job.include_all_versions && parsedV1job.versions) {
-					def versions = parsedV1job.versions.findAll { version ->
-						version.number != parsedV1job.current.number
-					}
+					def versions = parsedV1job.versions
 					
 					versions.sort { x, y ->
 						x.number <=> y.number
@@ -1120,8 +1118,6 @@ class SaagieClient {
 								getRunTimeVersionMapper(technologyV2VersionForVersions, technologyV2),
 								version)
 					}
-					
-					exportJob.versions.unique()
 				}
 				
 				if (current.file) {
@@ -1238,7 +1234,6 @@ class SaagieClient {
 							exportPipeline.addPipelineVersionDtoToVersions(item.jobs, null, null)
 						}
 						if (exportPipeline.versions.size() > 1) {
-							exportPipeline.versions.unique()
 							exportPipeline.versions.withIndex().collect { workflow, index ->
 								workflow.number = "${index + 1}"
 								workflow.jobs = workflow.jobs.collect { job ->
diff --git a/src/main/groovy/io/saagie/plugin/dataops/clients/SaagieClientUtils.groovy b/src/main/groovy/io/saagie/plugin/dataops/clients/SaagieClientUtils.groovy
index 62c5d3d4..610fca20 100644
--- a/src/main/groovy/io/saagie/plugin/dataops/clients/SaagieClientUtils.groovy
+++ b/src/main/groovy/io/saagie/plugin/dataops/clients/SaagieClientUtils.groovy
@@ -60,7 +60,12 @@ class SaagieClientUtils {
 				def packageFile = new File( "${ jobFolderPath }/${ EXPORTED_JOB_PACKAGE_FOLDER_NAME }" ).listFiles()
 				def packageFileHead = null
 				if ( packageFile && packageFile.head() ) {
-					packageFileHead = packageFile.head()
+					packageFileHead = packageFile.find {
+						if(!it.isDirectory()) {
+							return true
+						}
+						return false
+					}
 				}
 				extractedConfig.jobs[ jobId ].package = packageFileHead
 			}
diff --git a/src/main/groovy/io/saagie/plugin/dataops/tasks/service/importTask/ImportPipelineService.groovy b/src/main/groovy/io/saagie/plugin/dataops/tasks/service/importTask/ImportPipelineService.groovy
index c4e86761..af21da7b 100644
--- a/src/main/groovy/io/saagie/plugin/dataops/tasks/service/importTask/ImportPipelineService.groovy
+++ b/src/main/groovy/io/saagie/plugin/dataops/tasks/service/importTask/ImportPipelineService.groovy
@@ -65,11 +65,11 @@ class ImportPipelineService {
 		def jobForPipeVersionArray = []
 		
 		if (jobs && JobsFromPipelines) {
+			def jobsByNames = JobsFromPipelines.name
 			jobs.each { job ->
-				JobsFromPipelines.each { jobPipeline ->
-					if (jobPipeline.name == job.name) {
-						jobForPipeVersionArray.add(job.id)
-					}
+				def existingJob = jobsByNames.find { it.equals(job.name)}
+				if(existingJob) {
+					jobForPipeVersionArray.add(job.id)
 				}
 			}
 		}