diff --git a/test/bytecode_3.2/03_map.pyc b/test/bytecode_3.2/03_map.pyc
new file mode 100644
index 00000000..85712a6e
Binary files /dev/null and b/test/bytecode_3.2/03_map.pyc differ
diff --git a/test/bytecode_3.3/03_map.pyc b/test/bytecode_3.3/03_map.pyc
new file mode 100644
index 00000000..9712c1ea
Binary files /dev/null and b/test/bytecode_3.3/03_map.pyc differ
diff --git a/test/bytecode_3.5/03_map.pyc b/test/bytecode_3.5/03_map.pyc
new file mode 100644
index 00000000..ddf21f83
Binary files /dev/null and b/test/bytecode_3.5/03_map.pyc differ
diff --git a/uncompyle6/parser.py b/uncompyle6/parser.py
index 71d074eb..e09ff429 100644
--- a/uncompyle6/parser.py
+++ b/uncompyle6/parser.py
@@ -516,13 +516,9 @@ class PythonParser(GenericASTBuilder):
 
         mapexpr ::= BUILD_MAP kvlist
 
-        kvlist ::= kvlist kv2
-        kvlist ::= kvlist kv3
+        # Non-null kvlist items are broken out in the indiviual grammars
         kvlist ::=
 
-        kv2 ::= DUP_TOP expr expr ROT_THREE STORE_SUBSCR
-        kv3 ::= expr expr STORE_MAP
-
         exprlist ::= exprlist expr
         exprlist ::= expr
 
diff --git a/uncompyle6/parsers/parse22.py b/uncompyle6/parsers/parse22.py
index ed0aa2e3..ffa8aafb 100644
--- a/uncompyle6/parsers/parse22.py
+++ b/uncompyle6/parsers/parse22.py
@@ -18,11 +18,14 @@ class Python22Parser(Python23Parser):
                       COME_FROM POP_TOP COME_FROM
         list_for  ::= expr _for designator list_iter CONTINUE JUMP_FORWARD
                       COME_FROM POP_TOP COME_FROM
-
-        kvlist ::= kvlist kv
-        kv     ::= DUP_TOP expr ROT_TWO expr STORE_SUBSCR
         '''
 
+    def add_custom_rules(self, tokens, customize):
+        super(Python22Parser, self).add_custom_rules(tokens, customize)
+        self.remove_rules("""
+        kvlist ::= kvlist kv2
+        """)
+
 class Python22ParserSingle(Python23Parser, PythonParserSingle):
     pass
 
diff --git a/uncompyle6/parsers/parse24.py b/uncompyle6/parsers/parse24.py
index 2a904a15..2ce50cf4 100644
--- a/uncompyle6/parsers/parse24.py
+++ b/uncompyle6/parsers/parse24.py
@@ -47,9 +47,18 @@ class Python24Parser(Python25Parser):
 
         # Python 2.5+ adds POP_TOP at the end
         gen_comp_body ::= expr YIELD_VALUE
+
+        # Python 2.4
+        # Python 2.6, 2.7 and 3.3+ use kv3
+        # Python 2.3- use kv
+        kvlist ::= kvlist kv2
+        kv2 ::= DUP_TOP expr expr ROT_THREE STORE_SUBSCR
         '''
 
     def add_custom_rules(self, tokens, customize):
+        self.remove_rules("""
+        kvlist ::= kvlist kv3
+        """)
         super(Python24Parser, self).add_custom_rules(tokens, customize)
         if self.version == 2.4:
             self.check_reduce['nop_stmt'] = 'tokens'
diff --git a/uncompyle6/parsers/parse25.py b/uncompyle6/parsers/parse25.py
index 9e013712..adecc40c 100644
--- a/uncompyle6/parsers/parse25.py
+++ b/uncompyle6/parsers/parse25.py
@@ -43,6 +43,10 @@ class Python25Parser(Python26Parser):
 
         with_cleanup ::= LOAD_FAST DELETE_FAST WITH_CLEANUP END_FINALLY
         with_cleanup ::= LOAD_NAME DELETE_NAME WITH_CLEANUP END_FINALLY
+
+
+        kvlist ::= kvlist kv
+        kv     ::= DUP_TOP expr ROT_TWO expr STORE_SUBSCR
         """
 
     def add_custom_rules(self, tokens, customize):
diff --git a/uncompyle6/parsers/parse26.py b/uncompyle6/parsers/parse26.py
index 916f2da9..c9571475 100644
--- a/uncompyle6/parsers/parse26.py
+++ b/uncompyle6/parsers/parse26.py
@@ -254,6 +254,8 @@ class Python26Parser(Python2Parser):
         return_if_lambda   ::= RETURN_END_IF_LAMBDA POP_TOP
         conditional_lambda ::= expr jmp_false_then expr return_if_lambda
                                return_stmt_lambda LAMBDA_MARKER
+        kvlist ::= kvlist kv3
+        kv3 ::= expr expr STORE_MAP
         """
 
     def add_custom_rules(self, tokens, customize):
diff --git a/uncompyle6/parsers/parse27.py b/uncompyle6/parsers/parse27.py
index 40efe9a3..fc3a5f19 100644
--- a/uncompyle6/parsers/parse27.py
+++ b/uncompyle6/parsers/parse27.py
@@ -115,6 +115,8 @@ class Python27Parser(Python2Parser):
         return_if_lambda   ::= RETURN_END_IF_LAMBDA COME_FROM
         conditional_lambda ::= expr jmp_false expr return_if_lambda
                                return_stmt_lambda LAMBDA_MARKER
+        kvlist ::= kvlist kv3
+        kv3 ::= expr expr STORE_MAP
         """
 
     def add_custom_rules(self, tokens, customize):
diff --git a/uncompyle6/parsers/parse32.py b/uncompyle6/parsers/parse32.py
index abe1a38b..122d7d1e 100644
--- a/uncompyle6/parsers/parse32.py
+++ b/uncompyle6/parsers/parse32.py
@@ -49,6 +49,7 @@ class Python32Parser(Python3Parser):
 
         stmt           ::= del_deref_stmt
         del_deref_stmt ::= DELETE_DEREF
+        kv3            ::= expr expr STORE_MAP
         """
     pass