SLICE-11 Fixing generics