fix for generics