fix genericity