Fixed zip extraction logic