Fixes #1049, new version of zip/unzip