diff --git a/plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/impl/KotlinTypes.kt b/plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/impl/KotlinTypes.kt
index 63925d3506c..f3b7829e353 100644
--- a/plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/impl/KotlinTypes.kt
+++ b/plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/impl/KotlinTypes.kt
@@ -22,10 +22,7 @@ import com.intellij.psi.impl.source.PsiImmediateClassType
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.util.*
 import org.jetbrains.kotlin.java.model.JeElement
-import org.jetbrains.kotlin.java.model.elements.JeClassInitializerExecutableElement
-import org.jetbrains.kotlin.java.model.elements.JeMethodExecutableElement
-import org.jetbrains.kotlin.java.model.elements.JeTypeElement
-import org.jetbrains.kotlin.java.model.elements.JeVariableElement
+import org.jetbrains.kotlin.java.model.elements.*
 import org.jetbrains.kotlin.java.model.types.*
 import javax.lang.model.element.Element
 import javax.lang.model.element.TypeElement
@@ -250,12 +247,16 @@ class KotlinTypes(
         val containingType = containing.psiType
 
         val member = (element as JeElement).psi as? PsiMember ?: return element.asType()
-        val memberContainingClass = member.containingClass ?: return element.asType()
 
-        val relevantSuperType = if (memberContainingClass == containingType.resolve()) {
+        val memberOwnerClass = when (member) {
+            is PsiTypeParameter -> member.owner as? PsiClass
+            else -> member.containingClass
+        } ?: return element.asType()
+
+        val relevantSuperType = if (memberOwnerClass == containingType.resolve()) {
             containingType
         } else {
-            containingType.superTypes.findSuperType(memberContainingClass) ?: return element.asType()
+            containingType.superTypes.findSuperType(memberOwnerClass) ?: return element.asType()
         }
 
         val resolveResult = relevantSuperType.resolveGenerics()
@@ -270,7 +271,8 @@ class KotlinTypes(
                 JeMethodExecutableTypeMirror(method, signature, returnType)
             }
             is JeVariableElement -> substitutor.substitute(element.psi.type).toJeType(psiManager())
-            else -> throw IllegalArgumentException("Invalid element type: $element")
+            is JeTypeParameterElement -> substitutor.substitute(element.psi)?.toJeType(psiManager()) ?: element.asType()
+            else -> throw IllegalArgumentException("Invalid element type: ${element.javaClass.name} ($element)")
         }
     }
 
diff --git a/plugins/annotation-processing/testData/processors/AsMemberOfTypeParameters.kt b/plugins/annotation-processing/testData/processors/AsMemberOfTypeParameters.kt
new file mode 100644
index 00000000000..f249cc7e91f
--- /dev/null
+++ b/plugins/annotation-processing/testData/processors/AsMemberOfTypeParameters.kt
@@ -0,0 +1,10 @@
+annotation class Anno
+
+@Anno
+interface Intf<T>
+
+open class Base<T> : Intf<T> {
+    fun factory() = Base<CharSequence>()
+}
+
+class Impl : Base<String>()
\ No newline at end of file
diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/annotation/processing/test/processor/ProcessorTests.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/annotation/processing/test/processor/ProcessorTests.kt
index 778c76044c3..f2d3c64a59a 100644
--- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/annotation/processing/test/processor/ProcessorTests.kt
+++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/annotation/processing/test/processor/ProcessorTests.kt
@@ -281,6 +281,22 @@ class ProcessorTests : AbstractProcessorTest() {
         assertEquals("(T)T", implM.asType().toString())
         check(implM, "(java.lang.String)java.lang.String")
     }
+
+    fun testAsMemberOfTypeParameters() = test("AsMemberOfTypeParameters", "*") { set, roundEnv, env ->
+        val intf = env.findClass("Intf")
+        val intfT = intf.typeParameters[0]
+        val base = env.findClass("Base")
+        val baseFactory = base.findMethod("factory")
+        val impl = env.findClass("Impl")
+
+        assertEquals("T", intfT.asType().toString())
+
+        val implT = env.typeUtils.asMemberOf(impl.asType() as DeclaredType, intfT)
+        assertEquals("java.lang.String", implT.toString())
+
+        val baseT = env.typeUtils.asMemberOf(baseFactory.returnType as DeclaredType, intfT)
+        assertEquals("java.lang.CharSequence", baseT.toString())
+    }
     
     fun testDispose() {
         var savedEnv: ProcessingEnvironment? = null