fixes #811 more generics