diff --git a/main/src/main/scala/sbt/Cross.scala b/main/src/main/scala/sbt/Cross.scala
index 0a538012e..778002089 100644
--- a/main/src/main/scala/sbt/Cross.scala
+++ b/main/src/main/scala/sbt/Cross.scala
@@ -20,6 +20,10 @@ import sbt.internal.util.complete.{ DefaultParsers, Parser }
 import sbt.io.IO
 import sbt.librarymanagement.CrossVersion
 
+/**
+ * Cross implements the Scala cross building commands:
+ * + ("cross") command and ++ ("switch") command.
+ */
 object Cross {
 
   private[sbt] def spacedFirst(name: String) = opOrIDSpaced(name) ~ any.+
@@ -69,7 +73,7 @@ object Cross {
     token(CrossCommand <~ OptSpace) flatMap { _ =>
       (token(Parser.opt("-v" <~ Space)) ~ token(matched(state.combinedParser))).map {
         case (verbose, command) => CrossArgs(command, verbose.isDefined)
-      } & spacedFirst(CrossCommand)
+      }
     }
 
   private def crossRestoreSessionParser: Parser[String] = token(CrossRestoreSessionCommand)
diff --git a/sbt/src/sbt-test/actions/add-alias/build.sbt b/sbt/src/sbt-test/actions/add-alias/build.sbt
index cb5461c6b..089e388c1 100644
--- a/sbt/src/sbt-test/actions/add-alias/build.sbt
+++ b/sbt/src/sbt-test/actions/add-alias/build.sbt
@@ -1,2 +1,3 @@
 addCommandAlias("demo-success", "run true")
 addCommandAlias("demo-failure", "run false")
+addCommandAlias("z", "scalaVersion")
diff --git a/sbt/src/sbt-test/actions/add-alias/test b/sbt/src/sbt-test/actions/add-alias/test
index b82ec3f27..0269ab4f8 100644
--- a/sbt/src/sbt-test/actions/add-alias/test
+++ b/sbt/src/sbt-test/actions/add-alias/test
@@ -1,2 +1,4 @@
 > demo-success
 -> demo-failure
+> +z
+> z