Fixed repository generics