diff --git a/src/DOM.cpp b/src/DOM.cpp
index 2745d5b7c..8cbe5fa0c 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -170,9 +170,14 @@ const std::string DOM::get (const std::string& name, const Task& task)
   std::string canonical;
 
   // <attr>
-       if (task.size () && name == "id")                       return format (task.id);
-  else if (task.size () && name == "urgency")                  return format (task.urgency_c ());
-  else if (task.size () && A3::is_attribute (name, canonical)) return task.get (canonical);
+  if (task.size () && name == "id")
+    return format (task.id);
+
+  if (task.size () && name == "urgency")
+    return format (task.urgency_c ());
+
+  if (task.size () && context.a3t.canonicalize (canonical, "attribute", name))
+    return task.get (canonical);
 
   // <id>.<name>
   if (n.getInt (id))