diff --git a/packages/extension-form/src/internal/FormField.ts b/packages/extension-form/src/internal/FormField.ts
index 21447a0..fce5fa2 100644
--- a/packages/extension-form/src/internal/FormField.ts
+++ b/packages/extension-form/src/internal/FormField.ts
@@ -11,15 +11,22 @@ export interface GenericFormField<S extends Schema.Schema.Any> extends FormField
     readonly value: S["Type"]
 }
 
-export interface TupleFormField<S extends Schema.Tuple<readonly Schema.Schema.AnyNoContext[]>> extends FormField<S> {
+export interface TupleFormField<S extends Schema.Tuple<readonly Schema.Schema.Any[]>> extends FormField<S> {
     readonly _tag: "TupleFormField"
-    readonly elements: { [K in keyof S]: FormTree.FormTree<S["elements"][K]> }
+    readonly elements: { readonly [K in keyof S["elements"]]: FormTree.FormTree<
+        S["elements"][K] extends Schema.Schema.Any
+            ? S["elements"][K]
+            : never
+    > }
 }
 
 export interface Tuple2FormField<S extends Schema.Tuple2<Schema.Schema.Any, Schema.Schema.Any>> extends FormField<S> {
     readonly _tag: "Tuple2FormField"
-    // readonly elements: readonly [FormTree.FormTree<S["elements"][0]>, FormTree.FormTree<S["elements"][0]>]
-    readonly elements: [...{ [K in keyof S["elements"]]: S["elements"][K] }]
+    readonly elements: { readonly [K in keyof S["elements"]]: FormTree.FormTree<
+        S["elements"][K] extends Schema.Schema.Any
+            ? S["elements"][K]
+            : never
+    > }
 }
 
 export interface ArrayFormField<S extends Schema.Array$<Schema.Schema.AnyNoContext>> extends FormField<S> {
@@ -33,5 +40,5 @@ export interface StructFormField<S extends Schema.Struct<{
     readonly [x: symbol]: Schema.Schema.AnyNoContext
 }>> extends FormField<S> {
     readonly _tag: "StructFormField"
-    readonly fields: { [K in keyof S["fields"]]: FormTree.FormTree<S["fields"][K]> }
+    readonly fields: { readonly [K in keyof S["fields"]]: FormTree.FormTree<S["fields"][K]> }
 }
diff --git a/packages/extension-form/src/internal/FormTree.ts b/packages/extension-form/src/internal/FormTree.ts
index 9178055..e33ef0b 100644
--- a/packages/extension-form/src/internal/FormTree.ts
+++ b/packages/extension-form/src/internal/FormTree.ts
@@ -4,6 +4,7 @@ import type * as FormField from "./FormField.js"
 
 export type FormTree<S extends Schema.Schema.Any> = (
     S extends Schema.Tuple<any> ? FormField.TupleFormField<S> :
+    S extends Schema.Tuple2<any, any> ? FormField.Tuple2FormField<S> :
     S extends Schema.Array$<any> ? FormField.ArrayFormField<S> :
     S extends Schema.Struct<any> ? FormField.StructFormField<S> :
     FormField.GenericFormField<S>