Updated #354 for zip check