FIXED ZIP ISSUES