diff --git a/tools/src/main/java/io/toolisticon/aptk/tools/InterfaceUtils.java b/tools/src/main/java/io/toolisticon/aptk/tools/InterfaceUtils.java
index 3264621b..114c1a27 100644
--- a/tools/src/main/java/io/toolisticon/aptk/tools/InterfaceUtils.java
+++ b/tools/src/main/java/io/toolisticon/aptk/tools/InterfaceUtils.java
@@ -154,7 +154,7 @@ TypeMirrorWrapper getTypeMirrorWithReplacedTypeVars() {
             if (isTypeVar() && typeVarMap.containsKey(getTypeVar().toString())) {
                 return typeVarMap.get(getTypeVar().toString());
             } else {
-                return this;
+                return TypeMirrorWrapper.wrap(this.unwrap());
             }
         }