diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
index 80c36cc90bf..a12c3193732 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
@@ -103,7 +103,7 @@ public class FunctionCodegen extends GenerationStateAware {
             generateMethodHeaderAndBody(fun, jvmSignature, needJetAnnotations, propertyTypeSignature, functionDescriptor, context);
 
             if (state.getClassBuilderMode() == ClassBuilderMode.FULL && !isAbstract(functionDescriptor, kind)) {
-                generateBridgeIfNeeded(owner, state, v, jvmSignature.getAsmMethod(), functionDescriptor, kind);
+                generateBridgeIfNeeded(owner, state, v, jvmSignature.getAsmMethod(), functionDescriptor);
             }
         }
 
@@ -471,10 +471,9 @@ public class FunctionCodegen extends GenerationStateAware {
             GenerationState state,
             ClassBuilder v,
             Method jvmSignature,
-            FunctionDescriptor functionDescriptor,
-            OwnerKind kind
+            FunctionDescriptor functionDescriptor
     ) {
-        if (kind == OwnerKind.TRAIT_IMPL) {
+        if (owner.getContextKind() == OwnerKind.TRAIT_IMPL) {
             return;
         }
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
index e95a177ad5d..cbfe005e611 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
@@ -1298,7 +1298,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
                     FunctionCodegen.endVisit(iv, "trait method", callableDescriptorToDeclaration(bindingContext, fun));
                 }
 
-                FunctionCodegen.generateBridgeIfNeeded(context, state, v, function, fun, kind);
+                FunctionCodegen.generateBridgeIfNeeded(context, state, v, function, fun);
             }
         }
     }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
index ee375f61897..074a239668b 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
@@ -226,7 +226,7 @@ public class PropertyCodegen extends GenerationStateAware {
         }
         FunctionCodegen.endVisit(mv, "getter", origin);
 
-        FunctionCodegen.generateBridgeIfNeeded(context, state, v, jvmMethodSignature.getAsmMethod(), getter, kind);
+        FunctionCodegen.generateBridgeIfNeeded(context, state, v, jvmMethodSignature.getAsmMethod(), getter);
     }
 
     public static void generateJetPropertyAnnotation(
@@ -304,7 +304,7 @@ public class PropertyCodegen extends GenerationStateAware {
             }
             FunctionCodegen.endVisit(mv, "setter", origin);
 
-            FunctionCodegen.generateBridgeIfNeeded(context, state, v, jvmMethodSignature.getAsmMethod(), setter, kind);
+            FunctionCodegen.generateBridgeIfNeeded(context, state, v, jvmMethodSignature.getAsmMethod(), setter);
         }
     }