Modify to fall back to PCL Zip