Minor fix of generic type for JDK6