diff --git a/runner/src/index.ts b/runner/src/index.ts
index 4e5ea12..476cc23 100644
--- a/runner/src/index.ts
+++ b/runner/src/index.ts
@@ -13,7 +13,7 @@ const KitchenSink = {
   aFloat: 3.14,
   aDouble: 3.141592653589793238462643383279502884197,
   aBool: true,
-  //anUntypedObject: { hello: 'world' }, TODO uncomment after bug fix
+  anUntypedObject: { hello: 'world' },
   anEnum: 'option1',
   anEmbeddedObject: EmbeddedObject,
   anEmbeddedObjectArray: [EmbeddedObject, EmbeddedObject]
diff --git a/schema.yaml b/schema.yaml
index cf2870f..4868353 100644
--- a/schema.yaml
+++ b/schema.yaml
@@ -71,7 +71,7 @@ schemas:
       - anEnum
       - anEmbeddedObject
       - anEmbeddedObjectArray
-      #- anUntypedObject
+      - anUntypedObject
     properties:
       - name: anOptionalString
         type: string
@@ -93,10 +93,9 @@ schemas:
       - name: aBool
         type: boolean
         description: A Boolean
-      # TODO put back after bug fix
-      # - name: anUntypedObject
-      #   type: object
-      #   description: An untyped object
+      - name: anUntypedObject
+        type: object
+        description: An untyped object
       - name: anEnum
         description: A string enum (prop comment)
         $ref: "#/schemas/AStringEnum"