fix for #7369

fix for `Zip2` and test