diff --git a/src/script_opt/ZAM/OPs/non-uniform.op b/src/script_opt/ZAM/OPs/non-uniform.op
index b6abe22ad7..02b9baebea 100644
--- a/src/script_opt/ZAM/OPs/non-uniform.op
+++ b/src/script_opt/ZAM/OPs/non-uniform.op
@@ -32,7 +32,7 @@ eval	$$ = $1->HasField($2);
 internal-op Has-Field
 class VRii
 op-types R R I I
-eval	$$->RawOptField($2)->int_val = $1->HasField($3);
+eval	$$->RawOptField($2) = ZVal(zeek_int_t($1->HasField($3)));
 
 # The following generates an assignment version of Has-Field that we
 # don't use (because we need the one above that uses "includes-field-op")