diff --git a/lib/CodeGen/CGStmt.cpp b/lib/CodeGen/CGStmt.cpp
index f6f9827399f033f750a1f56aefe98ce793b2d97d..e8fdc8bcce1f5c86ec439f21b4dd6e40820dd766 100644
--- a/lib/CodeGen/CGStmt.cpp
+++ b/lib/CodeGen/CGStmt.cpp
@@ -504,8 +504,10 @@ void CodeGenFunction::EmitPlatinaIntrinsic(const ArrayRef<const Attr*> &Attrs) {
     // Attach the guardexpr to the instruction-metadata
     // We have to store our string in the LLVMContext
     LLVMContext& C = callsite->getContext();
-    MDNode *meta = MDNode::get(C, MDString::get(C, PG->getGuardExpr()));
-    callsite->setMetadata("platina.guardexpr", meta);
+    MDNode *type = MDNode::get(C, MDString::get(C, "guard"));
+    callsite->setMetadata("platina.type", type);
+    MDNode *expr = MDNode::get(C, MDString::get(C, PG->getGuardExpr()));
+    callsite->setMetadata("platina.expr", expr);
   }
 }