Fix for unzip file name issue