diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt b/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt
index ec9dddb704..76d3643c6c 100644
--- a/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt
+++ b/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt
@@ -705,7 +705,6 @@ open class ClassId(
     /**
      * Collects all declared methods (including private and protected) from class and all its superclasses to sequence
      */
-    // TODO for now it duplicates overridden methods JIRA:1458
     open val allMethods: Sequence<MethodId>
         get() = generateSequence(jClass) { it.superclass }
             .mapNotNull { it.declaredMethods }
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/ConstructorUtils.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/ConstructorUtils.kt
index c6fa56305c..094988d99a 100644
--- a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/ConstructorUtils.kt
+++ b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/ConstructorUtils.kt
@@ -239,7 +239,7 @@ internal fun ClassId.getAmbiguousOverloadsOf(executableId: ExecutableId): Sequen
     }
 
     return allExecutables.filter {
-        it.name == executableId.name && it.parameters.size == executableId.executable.parameters.size
+        it.name == executableId.name && it.parameters.size == executableId.executable.parameters.size && it.classId == executableId.classId
     }
 }