Make ZIP more robust.