Fixed generics compilation issue