Fix archive logic error
Fix archive logic