fix: fix generic types