Fixing ziptastic issue