changes to make the zip more resiliant