diff --git a/stdlib/3/builtins.pyi b/stdlib/3/builtins.pyi
index d722a17f3..f6d33534b 100644
--- a/stdlib/3/builtins.pyi
+++ b/stdlib/3/builtins.pyi
@@ -954,11 +954,11 @@ Ellipsis = ...  # type: ellipsis
 
 class BaseException:
     args = ...  # type: Tuple[Any, ...]
-    __cause__ = ...  # type: BaseException
-    __context__ = ...  # type: BaseException
-    __traceback__ = ...  # type: TracebackType
+    __cause__ = ...  # type: Optional[BaseException]
+    __context__ = ...  # type: Optional[BaseException]
+    __traceback__ = ...  # type: Optional[TracebackType]
     def __init__(self, *args: object, **kwargs: object) -> None: ...
-    def with_traceback(self, tb: Any) -> BaseException: ...
+    def with_traceback(self, tb: Optional[TracebackType]) -> BaseException: ...
 
 class GeneratorExit(BaseException): ...
 class KeyboardInterrupt(BaseException): ...