diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
index c3b07648746..e15066eee98 100644
--- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
+++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
@@ -580,6 +580,13 @@ public class DescriptorSerializer {
             if (declaration instanceof PropertyDescriptor || declaration instanceof FunctionDescriptor) {
                 builder.addMember(callableProto((CallableMemberDescriptor) declaration));
             }
+
+            if (declaration instanceof PropertyDescriptor) {
+                builder.addProperty(propertyProto((PropertyDescriptor) declaration));
+            }
+            else if (declaration instanceof FunctionDescriptor) {
+                builder.addFunction(functionProto((FunctionDescriptor) declaration));
+            }
         }
 
         extension.serializePackage(fragments, builder);
@@ -595,6 +602,13 @@ public class DescriptorSerializer {
             if (declaration instanceof PropertyDescriptor || declaration instanceof FunctionDescriptor) {
                 builder.addMember(callableProto((CallableMemberDescriptor) declaration));
             }
+
+            if (declaration instanceof PropertyDescriptor) {
+                builder.addProperty(propertyProto((PropertyDescriptor) declaration));
+            }
+            else if (declaration instanceof FunctionDescriptor) {
+                builder.addFunction(functionProto((FunctionDescriptor) declaration));
+            }
         }
 
         return builder;