Fixed generics error