Fix unzip when folders are present