diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java
index 92e782b73c..2a038dff9d 100644
--- a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java
+++ b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java
@@ -3393,10 +3393,13 @@ private int writeTokenDisplay(
                 break;
 
             case BEGIN_ENUM:
-            case BEGIN_SET:
                 append(sb, indent, "builder.append(" + fieldName + "());");
                 break;
 
+            case BEGIN_SET:
+                append(sb, indent, fieldName + "().appendTo(builder);");
+                break;
+
             case BEGIN_COMPOSITE:
             {
                 final String typeName = formatClassName(decoderName(typeToken.applicableTypeName()));