diff --git a/README.md b/README.md
index d95463b..73d2f1d 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@ This modification features:
 - **ConstantOrContextLambda2 type**
 - **Typing for Subconstruct**
 - **Type hint for Computed**
+- **Switch typing fixes**
 
 The original README.md file was described down below:
 # construct-typing
diff --git a/construct-stubs/core.pyi b/construct-stubs/core.pyi
index 59f482e..3792b96 100644
--- a/construct-stubs/core.pyi
+++ b/construct-stubs/core.pyi
@@ -802,6 +802,8 @@ def If(
 SwitchType = t.TypeVar("SwitchType")
 SwitchParsedType = t.TypeVar("SwitchParsedType")
 SwitchBuildTypes = t.TypeVar("SwitchBuildTypes")
+SwitchDefaultParsedType = t.TypeVar("SwitchDefaultParsedType")
+SwitchDefaultBuildTypes = t.TypeVar("SwitchDefaultBuildTypes")
 
 class Switch(Construct[ParsedType, BuildTypes]):
     keyfunc: ConstantOrContextLambda[t.Any]
@@ -816,11 +818,11 @@ class Switch(Construct[ParsedType, BuildTypes]):
     ) -> Switch[SwitchParsedType | None, SwitchBuildTypes | None]: ...
     @t.overload
     def __new__(
-        cls: "type[Switch[SwitchParsedType, SwitchBuildTypes]]",
+        cls: "type[Switch[SwitchParsedType | SwitchDefaultParsedType, SwitchBuildTypes | SwitchDefaultBuildTypes]]",
         keyfunc: ConstantOrContextLambda[SwitchType],
         cases: dict[t.Any, Construct[SwitchParsedType, SwitchBuildTypes]],
-        default: Construct[SwitchParsedType, SwitchBuildTypes],
-    ) -> Switch[SwitchParsedType, SwitchBuildTypes]: ...
+        default: Construct[SwitchDefaultParsedType, SwitchDefaultBuildTypes],
+    ) -> Switch[SwitchParsedType | SwitchDefaultParsedType, SwitchBuildTypes | SwitchDefaultBuildTypes]: ...
     # @t.overload
     # def __new__(
     #     cls: "type[Switch[t.Any, t.Any]]",