diff --git a/uncompyle6/scanner.py b/uncompyle6/scanner.py
index 1347762d..acbe7ed9 100755
--- a/uncompyle6/scanner.py
+++ b/uncompyle6/scanner.py
@@ -320,5 +320,6 @@ if __name__ == "__main__":
     import inspect, uncompyle6
     co = inspect.currentframe().f_code
     scanner = get_scanner('2.7.13', True)
+    scanner = get_scanner(sys.version[:5], False)
     scanner = get_scanner(uncompyle6.PYTHON_VERSION, IS_PYPY, True)
     tokens, customize = scanner.ingest(co, {})
diff --git a/uncompyle6/semantics/fragments.py b/uncompyle6/semantics/fragments.py
index 2010f4f8..1d6fe1f9 100644
--- a/uncompyle6/semantics/fragments.py
+++ b/uncompyle6/semantics/fragments.py
@@ -134,6 +134,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
         # FIXME: is there a better way?
         global MAP_DIRECT_FRAGMENT
         MAP_DIRECT_FRAGMENT = dict(TABLE_DIRECT, **TABLE_DIRECT_FRAGMENT),
+        return
 
     f = property(lambda s: s.params['f'],
                  lambda s, x: s.params.__setitem__('f', x),