added some checks for zip