Properly handle zips
Fixes