diff --git a/src/de/dhbwstuttgart/syntaxtree/Class.java b/src/de/dhbwstuttgart/syntaxtree/Class.java
index 27c19a94..7c620b65 100755
--- a/src/de/dhbwstuttgart/syntaxtree/Class.java
+++ b/src/de/dhbwstuttgart/syntaxtree/Class.java
@@ -234,7 +234,7 @@ public class Class extends SyntaxTreeNode implements AClassOrInterface, IItemWit
     // ino.end
     // ino.method.Class.23047.definition 
     public Class(String name, Modifiers mod, ClassBody cb, Vector<Type> ct,
-            Type superclass, Vector<Type> vector, Vector<Type> paralist, int offset)
+            Type superclass, Vector<Type> vector, Vector<? extends Type> paralist, int offset)
     // ino.end
 // ino.method.Class.23047.body 
 {
@@ -246,7 +246,11 @@ public class Class extends SyntaxTreeNode implements AClassOrInterface, IItemWit
         	this.superClass = superclass;
         }
         if (vector != null) setSuperInterfaces(vector);
-        if (paralist != null){
+        if (paralist != null && !paralist.isEmpty()){
+        	Type lastPara = paralist.lastElement();
+        	Integer lastItemOffset = lastPara.getOffset() + lastPara.get_Name().length();
+        	this.setGenericParameter(new GenericDeclarationList((Vector<GenericTypeVar>)paralist, lastItemOffset));
+        	/*
         	//this.set_ParaList(paralist);
         	Vector<GenericTypeVar> gtvList = new Vector<>();
         	int lastItemOffset = 0;
@@ -256,6 +260,7 @@ public class Class extends SyntaxTreeNode implements AClassOrInterface, IItemWit
         		lastItemOffset = paraT.getOffset() + paraT.get_Name().length();
         	}
         	this.genericClassParameters = new GenericDeclarationList(gtvList, lastItemOffset);
+        	*/
         }
         if(usedIdsToCheck!=null) this.usedIdsToCheck=usedIdsToCheck;
 
diff --git a/test/plugindevelopment/TypeInsertTests/GenericVarTest3.jav b/test/plugindevelopment/TypeInsertTests/GenericVarTest3.jav
index 06b4a32d..45dc1167 100644
--- a/test/plugindevelopment/TypeInsertTests/GenericVarTest3.jav
+++ b/test/plugindevelopment/TypeInsertTests/GenericVarTest3.jav
@@ -1,5 +1,5 @@
-class GenericTest{
-	<A extends Integer> A method(){
+class GenericTest<A extends Integer>{
+	 A method(){
 		A x;
 		Integer integer;
 		x = integer;