Fix the unzip part