Tweak Zip implementation