Fix for the zip bug