fix generics