Q4 generics now correct