diff --git a/JavaClass.java b/JavaClass.java
index 852e2f3..4d0fb3e 100644
--- a/JavaClass.java
+++ b/JavaClass.java
@@ -370,6 +370,8 @@ static Element getTypeParametersNode (Document doc,  TypeVariable<Method>[] tps)
 						tc_elem.setAttribute ("type", tcc.getName ());
 					else if (pt != null)
 						tc_elem.setAttribute ("type", pt.toString ()); // FIXME: this is not strictly compliant to the ParameterizedType API (no assured tostring() behavior to return type name)
+					else if (tc instanceof TypeVariable<?>)
+						tc_elem.setAttribute ("type", ((TypeVariable<?>) tc).getName ());
 					else
 						throw new UnsupportedOperationException ("Type is " + tc.getClass ());
 					tcs_elem.appendChild (tc_elem);