Fix for the zip bug (end)