Another small fix on generics