diff --git a/cli/src/main/scala/coursier/cli/Coursier.scala b/cli/src/main/scala/coursier/cli/Coursier.scala
index dce73b2f4..b576c79ff 100644
--- a/cli/src/main/scala/coursier/cli/Coursier.scala
+++ b/cli/src/main/scala/coursier/cli/Coursier.scala
@@ -75,7 +75,7 @@ case class Fetch(
 
   val helper = new Helper(common, remainingArgs)
 
-  val files0 = helper.fetch(sources = false, javadoc = false)
+  val files0 = helper.fetch(sources = sources, javadoc = javadoc)
 
   val out =
     if (classpath)
diff --git a/cli/src/main/scala/coursier/cli/Helper.scala b/cli/src/main/scala/coursier/cli/Helper.scala
index 11a7176b4..420d7efdc 100644
--- a/cli/src/main/scala/coursier/cli/Helper.scala
+++ b/cli/src/main/scala/coursier/cli/Helper.scala
@@ -303,7 +303,7 @@ class Helper(
 
       errPrintln(msg)
     }
-    val artifacts0 =
+    val artifacts =
       if (sources || javadoc) {
         var classifiers = Seq.empty[String]
         if (sources)
@@ -314,18 +314,6 @@ class Helper(
         res.classifiersArtifacts(classifiers)
       } else
         res.artifacts
-    val main0 = !sources && !javadoc
-    val artifacts = artifacts0.flatMap{ artifact =>
-      var l = List.empty[Artifact]
-      if (sources)
-        l = artifact.extra.get("sources").toList ::: l
-      if (javadoc)
-        l = artifact.extra.get("javadoc").toList ::: l
-      if (main0)
-        l = artifact :: l
-
-      l
-    }
 
     val logger =
       if (verbose0 >= 0)