Fixed handling of zip files