@@ -937,7 +937,7 @@ setMethod("drawGD", signature("DataTrack"), function(GdObject, minBase, maxBase,

     vals <- values(GdObject)

     groups <- .dpOrDefault(GdObject, "groups")

     if (!is.null(groups) && length(groups) != nrow(vals)) {

-        stop("'groups' must be a vector of similar length as the number of rows in the data matrix (", nrow(vals), ")")

+        stop("'groups' must be a vector of the same length as the number of rows in the data matrix (", nrow(vals), ")")

     }

     if (!is.null(groups) && !is.factor(groups)) {

         groups <- factor(groups)

@@ -1620,10 +1620,8 @@ addScheme <- function(scheme, name) {

     } else { ## Otherwise colors are being mapped to group factors

         if (!is.factor(groups)) {

             groups <- factor(groups)

-            nms <- unique(groups)

-        } else {

-            nms <- levels(groups)

         }

+        nms <- levels(groups)

         col <- .dpOrDefault(GdObject, "col", lattice::trellis.par.get("superpose.line")$col)

         col <- rep(col, nlevels(groups))[seq_along(levels(groups))]

         col.line <- rep(.dpOrDefault(GdObject, "col.line", col), nlevels(groups))[seq_along(levels(groups))]