diff --git a/qa/drc_proto/drc_rule.cpp b/qa/drc_proto/drc_rule.cpp
index 75a4b2ccae..7981c918c2 100644
--- a/qa/drc_proto/drc_rule.cpp
+++ b/qa/drc_proto/drc_rule.cpp
@@ -57,11 +57,11 @@ bool test::DRC_RULE_CONDITION::EvaluateFor( const BOARD_ITEM* aItemA, const BOAR
 {
     BOARD_ITEM* a = const_cast<BOARD_ITEM*>( aItemA );
     BOARD_ITEM* b = aItemB ? const_cast<BOARD_ITEM*>( aItemB ) : DELETED_BOARD_ITEM::GetInstance();
+    LIBEVAL::CONTEXT ctx;
+    m_ucode->SetItems( a, b );
+    ctx.Run( m_ucode );
 
-    PCB_EXPR_CONTEXT ctx;
-    ctx.SetItems( a, b );
-
-    return m_ucode->Run( &ctx )->AsDouble() != 0.0;
+    return ctx.GetResult()->AsDouble() != 0.0;
 }