diff --git a/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java b/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java
index dd93442db80..555396c1618 100644
--- a/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java
+++ b/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java
@@ -120,7 +120,7 @@ public final class Intrinsics {
 
     private void declareStringIntrinsics() {
         PropertyDescriptor lengthProperty =
-                getPropertyByName(library.getString().getDefaultType().getMemberScope(), "length");
+                getPropertyByName(library.getCharSequence().getDefaultType().getMemberScope(), "length");
         functionIntrinsics.put(lengthProperty.getGetter(), LengthIntrinsic.INSTANCE);
         FunctionDescriptor getFunction =
                 getFunctionByName(library.getCharSequence().getDefaultType().getMemberScope(), "get");
diff --git a/translator/src/org/jetbrains/k2js/translate/reference/CallExpressionTranslator.java b/translator/src/org/jetbrains/k2js/translate/reference/CallExpressionTranslator.java
index 428382b0b21..fc6e1181a9e 100644
--- a/translator/src/org/jetbrains/k2js/translate/reference/CallExpressionTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/reference/CallExpressionTranslator.java
@@ -14,7 +14,6 @@ import org.jetbrains.k2js.translate.general.Translation;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import static org.jetbrains.k2js.translate.utils.BindingUtils.getDefaultArgument;
 import static org.jetbrains.k2js.translate.utils.BindingUtils.getResolvedCallForCallExpression;
@@ -67,9 +66,8 @@ public final class CallExpressionTranslator extends AbstractTranslator {
     private List<JsExpression> translateArguments() {
         List<JsExpression> result = new ArrayList<JsExpression>();
         ResolvedCall<?> resolvedCall = getResolvedCallForCallExpression(context().bindingContext(), expression);
-        Map<ValueParameterDescriptor, ResolvedValueArgument> formalToActualArguments = resolvedCall.getValueArguments();
         for (ValueParameterDescriptor parameterDescriptor : resolvedCall.getResultingDescriptor().getValueParameters()) {
-            ResolvedValueArgument actualArgument = formalToActualArguments.get(parameterDescriptor);
+            ResolvedValueArgument actualArgument = resolvedCall.getValueArgumentsByIndex().get(parameterDescriptor.getIndex());
             result.add(translateSingleArgument(actualArgument, parameterDescriptor));
         }
         return result;