diff --git a/R/greedyMix.R b/R/greedyMix.R
index 303f63e..625544c 100644
--- a/R/greedyMix.R
+++ b/R/greedyMix.R
@@ -27,15 +27,30 @@ greedyMix <- function(
   inp = NULL, popnames = NULL, fixedK = FALSE, verbose = FALSE
 ) {
   # Importing and handling data ================================================
-  data <- importFile(data, format, verbose)
-  data <- handleData(data, tolower(format))
-  c <- list(
-    noalle = data[["noalle"]],
-    data = data[["newData"]],
-    adjprior = data[["adjprior"]],
-    priorTerm = data[["priorTerm"]],
-    rowsFromInd = data[["rowsFromInd"]]
-  )
+  if (tolower(format) %in% "baps") {
+    data <- process_BAPS_data(data, NULL)
+    c <- list(
+      noalle = data[["noalle"]],
+      data = data[["data"]],
+      adjprior = data[["adjprior"]],
+      priorTerm = data[["priorTerm"]],
+      rowsFromInd = data[["rowsFromInd"]],
+      Z = data[["Z"]],
+      dist = data[["dist"]]
+    )
+  } else {
+    data <- importFile(data, format, verbose)
+    data <- handleData(data, tolower(format))
+    c <- list(
+      noalle = data[["noalle"]],
+      data = data[["newData"]],
+      adjprior = data[["adjprior"]],
+      priorTerm = data[["priorTerm"]],
+      rowsFromInd = data[["rowsFromInd"]],
+      Z = data[["Z"]],
+      dist = data[["dist"]]
+    )
+  }
 
   # Comparing partitions =======================================================
   if (!is.null(partitionCompare)) {
diff --git a/R/importFile.R b/R/importFile.R
index 494a6a6..2ed9c75 100644
--- a/R/importFile.R
+++ b/R/importFile.R
@@ -42,8 +42,6 @@ importFile <- function(data, format, verbose) {
     } else {
       out <- adegenet::read.genepop(data)
     }
-  } else if (format == "baps") {
-    out <- process_BAPS_data(data, NULL)$data
   } else {
     stop("Format not supported.")
   }