fix generic type (how did this work before?)