diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java
index 7a8888a7434..0bf14bd5b7b 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java
@@ -222,8 +222,7 @@ public class CodegenBinding {
         bindingTrace.record(ASM_TYPE, classDescriptor, asmType);
         bindingTrace.record(CLOSURE, classDescriptor, closure);
 
-        // TODO: this is temporary before we have proper inner classes
-        if (canHaveOuter(bindingTrace.getBindingContext(), classDescriptor) && !functionLiteral) {
+        if (classDescriptor.isInner()) {
             closure.setCaptureThis();
         }