Work on fixing the Zip Archive file issue