1 files changed, 8 insertions, 1 deletions
diff --git a/GSM48.st b/GSM48.st
index 55338b6..f3e2c15 100644
--- a/GSM48.st
+++ b/GSM48.st
@@ -2100,7 +2100,14 @@ Osmo.TLVParserBase subclass: GSM48MSG [
                 ].
             ].
 
-            "TODO: Handle the Conditionals too"
+            "TODO: Handle the Conditionals better here.."
+            each isConditional ifTrue: [ | tmp |
+                "Only write if it is already present"
+                tmp := self instVarNamed: each instVarName.
+                tmp ifNotNil: [
+                    tmp writeOn: aMsg.
+                ].
+            ].
         ]
     ]