OPAL-1564: Keep rewriting the extension for zip file format