Fixed emtpy folder issue when using ZIP