Fixed compiler errors 'error TS2173: Generic type references must include all type arguments.'