additional generics correction