Fix for Unzip exception