diff --git a/proto/message.py b/proto/message.py
index f4ab3124..815bf88c 100644
--- a/proto/message.py
+++ b/proto/message.py
@@ -220,7 +220,7 @@ def __new__(mcls, name, bases, attrs):
         if len(local_path) == 1:
             file_info.descriptor.message_type.add().MergeFrom(desc)
         else:
-            file_info.nested[tuple(full_name.split('.'))] = desc
+            file_info.nested[local_path] = desc
 
         # Create the MessageInfo instance to be attached to this message.
         attrs['_meta'] = _MessageInfo(
diff --git a/setup.py b/setup.py
index 4e20a551..5d354575 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@
 
 setup(
     name='proto-plus',
-    version='0.2.0',
+    version='0.2.1',
     license='Apache 2.0',
     author='Luke Sneeringer',
     author_email='lukesneeringer@google.com',