diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java
index cde64312347..f91e424aa53 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java
+++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java
@@ -120,10 +120,13 @@ public class DescriptorSerializer {
             }
         }
 
-        Collection<DeclarationDescriptor> nestedClasses = classDescriptor.getUnsubstitutedInnerClassesScope().getAllDescriptors();
-        for (DeclarationDescriptor descriptor : sort(nestedClasses)) {
-            if (!isEnumEntry(descriptor)) {
-                builder.addNestedClassName(nameTable.getSimpleNameIndex(descriptor.getName()));
+        for (DeclarationDescriptor descriptor : sort(classDescriptor.getUnsubstitutedInnerClassesScope().getAllDescriptors())) {
+            int name = nameTable.getSimpleNameIndex(descriptor.getName());
+            if (isEnumEntry(descriptor)) {
+                builder.addEnumEntry(name);
+            }
+            else {
+                builder.addNestedClassName(name);
             }
         }
 
@@ -132,15 +135,6 @@ public class DescriptorSerializer {
             builder.setClassObject(classObjectProto(classObject));
         }
 
-        if (classDescriptor.getKind() == ClassKind.ENUM_CLASS) {
-            // Not calling sort() here, because the order of enum entries matters
-            for (DeclarationDescriptor descriptor : nestedClasses) {
-                if (isEnumEntry(descriptor)) {
-                    builder.addEnumEntry(nameTable.getSimpleNameIndex(descriptor.getName()));
-                }
-            }
-        }
-
         return builder;
     }