Make Archive work correctly