Fixing NGenerics dependency