1 files changed, 3 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index 917a68c..38102fb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -552,6 +552,8 @@ static char *replace(char *body, char *replace, char *id)
 			idx += len;
 			continue;
 		}
+
+		new = append(new, body[idx++]);
 	}
 
 	free(body);
@@ -741,7 +743,7 @@ static void expand_instance(char *id, char *instance)
 			super = replace_id(super, name, type);
 
 		if (args)
-			args = replace_id(super, name, type);
+			args = replace_id(args, name, type);
 	}
 
 	drop_tokens(&type_traits);