diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java
index bfb1f3b0883..ede7a3ecc78 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java
@@ -229,6 +229,19 @@ public class TopDownAnalyzer {
                             @Override
                             public void visitClass(@NotNull JetClass klass) {
                                 visitClassOrObject(klass);
+
+                                registerPrimaryConstructorParameters(klass);
+                            }
+
+                            private void registerPrimaryConstructorParameters(@NotNull JetClass klass) {
+                                for (JetParameter jetParameter : klass.getPrimaryConstructorParameters()) {
+                                    if (jetParameter.getValOrVarNode() != null) {
+                                        c.getPrimaryConstructorParameterProperties().put(
+                                                jetParameter,
+                                                (PropertyDescriptor) resolveSession.resolveToDescriptor(jetParameter)
+                                        );
+                                    }
+                                }
                             }
 
                             @Override