Adjust zip method to be more compatible