fix generics issue