Fix the zip file handler again