diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java
index 1f58cd70dc4..e28df0b4a14 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java
@@ -417,12 +417,7 @@ public abstract class CodegenContext<T extends DeclarationDescriptor> {
     }
 
     protected boolean shouldAddChild(@NotNull CodegenContext child) {
-        DeclarationDescriptor childContextDescriptor = child.contextDescriptor;
-        if (childContextDescriptor instanceof ClassDescriptor) {
-            ClassKind kind = ((ClassDescriptor) childContextDescriptor).getKind();
-                return kind == ClassKind.CLASS_OBJECT;
-        }
-        return false;
+        return DescriptorUtils.isClassObject(child.contextDescriptor);
     }
 
     @Nullable