diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java
index eeb74ee4adb..51c6da9af9f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java
@@ -143,7 +143,7 @@ public class TracingStrategyImpl implements TracingStrategy {
 
     @Override
     public <D extends CallableDescriptor> void ambiguity(@NotNull BindingTrace trace, @NotNull Collection<ResolvedCallWithTrace<D>> descriptors) {
-        trace.report(OVERLOAD_RESOLUTION_AMBIGUITY.on(call.getCallElement(), descriptors));
+        trace.report(OVERLOAD_RESOLUTION_AMBIGUITY.on(reference, descriptors));
     }
 
     @Override
diff --git a/compiler/testData/diagnostics/tests/AutocastAmbiguitites.kt b/compiler/testData/diagnostics/tests/AutocastAmbiguitites.kt
index 614374e9521..93097f4489d 100644
--- a/compiler/testData/diagnostics/tests/AutocastAmbiguitites.kt
+++ b/compiler/testData/diagnostics/tests/AutocastAmbiguitites.kt
@@ -10,7 +10,7 @@ class C() {
 fun test(a : Any?) {
   if (a is B) {
       if (a is C) {
-          a.<!OVERLOAD_RESOLUTION_AMBIGUITY!>bar()<!>;
+          a.<!OVERLOAD_RESOLUTION_AMBIGUITY!>bar<!>();
       }
   }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.kt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.kt
index 8b40195586a..4bbf9d836ba 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.kt
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.kt
@@ -6,11 +6,11 @@ fun foo() {
     bar(<!TYPE_MISMATCH!>x<!>)
     if (x != 2) {
         if (x == null) return
-        2+<!SYNTAX!><!>
+        2<!OVERLOAD_RESOLUTION_AMBIGUITY!>+<!><!SYNTAX!><!>
     }
     else {
         if (<!SENSELESS_COMPARISON!>x == null<!>) return
-        2+<!SYNTAX!><!>
+        2<!OVERLOAD_RESOLUTION_AMBIGUITY!>+<!><!SYNTAX!><!>
     }
     bar(x)
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.kt b/compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.kt
index 3862b810009..22d85ac3514 100644
--- a/compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.kt
+++ b/compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.kt
@@ -12,7 +12,7 @@ public class A {
 // FILE: test.kt
 
 fun main() {
-    A.<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo { "Hello!" }<!>
+    A.<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!> { "Hello!" }
     A.foo(Runnable { "Hello!" })
 }
 
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.kt b/compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.kt
index 20f3c7dd167..43802e11053 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.kt
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.kt
@@ -21,7 +21,7 @@ class MyIterator {
 class MyElement
 
 fun test1(collection: MyCollection) {
-    collection.<!OVERLOAD_RESOLUTION_AMBIGUITY!>iterator()<!>
+    collection.<!OVERLOAD_RESOLUTION_AMBIGUITY!>iterator<!>()
     for (element in <!ITERATOR_AMBIGUITY!>collection<!>) {
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.kt b/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.kt
index a1c71570df3..a51b23f8822 100644
--- a/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.kt
+++ b/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.kt
@@ -1,7 +1,7 @@
 // FILE: checkAmbiguityBetweenRootAndPackage.kt
 package test
 
-val t = <!OVERLOAD_RESOLUTION_AMBIGUITY!>testFun()<!>
+val t = <!OVERLOAD_RESOLUTION_AMBIGUITY!>testFun<!>()
 
 // FILE: checkAmbiguityBetweenRootAndPackageRoot.kt
 fun testFun() = 12
diff --git a/compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.kt b/compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.kt
index 510e039129c..0af67217928 100644
--- a/compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.kt
+++ b/compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.kt
@@ -12,7 +12,7 @@ class C() {
 fun test(a : Any?) {
     if (a is B) {
         if (a is C) {
-            a.<!OVERLOAD_RESOLUTION_AMBIGUITY!>bar()<!>;
+            a.<!OVERLOAD_RESOLUTION_AMBIGUITY!>bar<!>();
         }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.kt b/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.kt
index cf52df1fbd1..c6dde07bd9f 100644
--- a/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.kt
+++ b/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.kt
@@ -2,5 +2,5 @@ fun foo(vararg <!UNUSED_PARAMETER!>t<!> : String) = ""
 fun foo(vararg <!UNUSED_PARAMETER!>t<!> : Int) = ""
 
 fun test() {
-    <!OVERLOAD_RESOLUTION_AMBIGUITY!>foo()<!>
+    <!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>()
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.kt b/compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.kt
index dcc1d93ae4b..c862a4aa15a 100644
--- a/compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.kt
+++ b/compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.kt
@@ -3,9 +3,9 @@ fun main(j : C, s : Array<String?>) {
     j.from()
     j.from("")
     j.from("", "")
-    j.<!OVERLOAD_RESOLUTION_AMBIGUITY!>from("", "", "")<!>
+    j.<!OVERLOAD_RESOLUTION_AMBIGUITY!>from<!>("", "", "")
 
-    j.<!OVERLOAD_RESOLUTION_AMBIGUITY!>from("", *s)<!> // This should not be an ambiguity, see KT-1842
+    j.<!OVERLOAD_RESOLUTION_AMBIGUITY!>from<!>("", *s) // This should not be an ambiguity, see KT-1842
     j.from(*s)
 }