generic type fix