diff --git a/src/Context.cpp b/src/Context.cpp
index 1f59ab699..d9dafe095 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -220,10 +220,7 @@ int Context::initialize (int argc, const char** argv)
       if (combined.length ())
         combined += ' ';
 
-      if (a.attribute ("canonical") != "")
-        combined += a.attribute ("canonical");
-      else
-        combined += a.attribute ("raw");
+      combined += a.getToken ();
 
       if (a.hasTag ("DEFAULT"))
         foundDefault = true;