diff --git a/R/RowFactor.R b/R/RowFactor.R
index d29e5f1..98456c1 100644
--- a/R/RowFactor.R
+++ b/R/RowFactor.R
@@ -58,10 +58,9 @@ RowFactor <- function(x, name = deparse(expr), levelnames=levels(x),
             catname <- paste(insert, levelnames[i], sep="")
     	    test <- i  # Work around a bug in R 2.12.x!
     	    
-    	    # labelSubset is local; can't use call() here; see issue #30
-    	    test <- as.call(list(labelSubset,
+    	    test <- call("labelSubset",
     	                 subset = call("==", call("as.integer", call("as.factor", expr)), i),
-    	                 label = deparse(expr)))
+    	                 label = deparse(expr))
             term <- call("*", call("Heading", makeName(catname)), 
                               test)
             if (i == 1)