Issue #28649: fix second issue with _ForwardRef (#328) (3.5->3.6)
diff --git a/Lib/typing.py b/Lib/typing.py
index 462cc22..7a64e07 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -218,7 +218,7 @@
         self.__forward_value__ = None
 
     def _eval_type(self, globalns, localns):
-        if not self.__forward_evaluated__:
+        if not self.__forward_evaluated__ or localns is not globalns:
             if globalns is None and localns is None:
                 globalns = localns = {}
             elif globalns is None: