diff --git a/src/org/hwo/models/FlexibleObjectListModel.java b/src/org/hwo/models/FlexibleObjectListModel.java
index 859b1a9..d52f08d 100644
--- a/src/org/hwo/models/FlexibleObjectListModel.java
+++ b/src/org/hwo/models/FlexibleObjectListModel.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.swing.AbstractListModel;
 
-public class FlexibleObjectListModel<T> extends AbstractListModel {
+public class FlexibleObjectListModel<T> extends AbstractListModel<T> {
 
 	private List<T> items;
 	
@@ -13,7 +13,7 @@ public class FlexibleObjectListModel<T> extends AbstractListModel {
 	}
 	
 	@Override
-	public Object getElementAt(int index) {
+	public T getElementAt(int index) {
 		return this.items.get(index);
 	}
 
@@ -22,6 +22,7 @@ public class FlexibleObjectListModel<T> extends AbstractListModel {
 		return this.items.size();
 	}
 	
+	
 	public void clear()
 	{
 		this.items.clear();