Generics mismatch fixed