diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/ReceiverContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/ReceiverContext.java
index dcbea39e9e5..1bbbe779322 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/ReceiverContext.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/ReceiverContext.java
@@ -26,8 +26,6 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
  * @author alex.tkachman
 */
 abstract class ReceiverContext extends CodegenContext {
-    final CallableDescriptor receiverDescriptor;
-
     public ReceiverContext(
             CallableDescriptor contextDescriptor,
             OwnerKind contextKind,
@@ -37,11 +35,11 @@ abstract class ReceiverContext extends CodegenContext {
             @Nullable LocalLookup localLookup
     ) {
         super(contextDescriptor, contextKind, parentContext, closure, thisDescriptor, localLookup);
-        receiverDescriptor = contextDescriptor.getReceiverParameter().exists() ? contextDescriptor : null;
     }
 
     @Override
     public CallableDescriptor getReceiverDescriptor() {
-        return receiverDescriptor;
+        final CallableDescriptor callableDescriptor = (CallableDescriptor) getContextDescriptor();
+        return callableDescriptor.getReceiverParameter().exists() ? callableDescriptor : null;
     }
 }