diff --git a/annotations/src/main/java/org/leandreck/endpoints/processor/model/typefactories/MapTypeNodeFactory.java b/annotations/src/main/java/org/leandreck/endpoints/processor/model/typefactories/MapTypeNodeFactory.java
index 78a4e5b..5af18ec 100644
--- a/annotations/src/main/java/org/leandreck/endpoints/processor/model/typefactories/MapTypeNodeFactory.java
+++ b/annotations/src/main/java/org/leandreck/endpoints/processor/model/typefactories/MapTypeNodeFactory.java
@@ -105,6 +105,7 @@ class MapTypeNode extends TypeNode {
         private final String typeName;
         private final String type;
         private final List<TypeNode> typeParameters;
+        private final String typeNameVariable;
 
         //lazy
         private Set<TypeNode> imports;
@@ -122,6 +123,7 @@ class MapTypeNode extends TypeNode {
             this.typeName = typeName;
             this.type = "{ [index: " + typeParameters.get(0).getType() + "]: " + typeParameters.get(1).getType() + " }";
             this.typeParameters = typeParameters;
+            this.typeNameVariable = "{ [index: " + typeParameters.get(0).getTypeNameVariable() + "]: " + typeParameters.get(1).getTypeNameVariable() + " }";
         }
 
         @Override
@@ -179,5 +181,10 @@ public Set<TypeNode> getImports() {
             }
             return imports;
         }
+
+        @Override
+        public String getTypeNameVariable() {
+            return this.typeNameVariable;
+        }
     }
 }