diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt
index 3288b755317..c7d2104c571 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt
@@ -98,7 +98,7 @@ class GenericFunction(val signature: String, val keyword: String = "fun") {
 
     var toNullableT: Boolean = false
 
-    var receiverAsterisk = false
+    val receiverAsterisk = FamilyProperty<Boolean>()
 
     val buildFamilies = LinkedHashSet(defaultFamilies)
     val buildPrimitives = LinkedHashSet(defaultPrimitives)
@@ -132,10 +132,6 @@ class GenericFunction(val signature: String, val keyword: String = "fun") {
         typeParams.add(t)
     }
 
-    fun receiverAsterisk(v: Boolean) {
-        receiverAsterisk = v
-    }
-
     fun exclude(vararg families: Family) {
         buildFamilies.removeAll(families.toList())
     }
@@ -293,7 +289,7 @@ class GenericFunction(val signature: String, val keyword: String = "fun") {
             return answer.toString()
         }
 
-        val isAsteriskOrT = if (receiverAsterisk) "*" else "T"
+        val isAsteriskOrT = if (receiverAsterisk[f] == true) "*" else "T"
         val receiver = when (f) {
             Iterables -> "Iterable<$isAsteriskOrT>"
             Collections -> "Collection<$isAsteriskOrT>"