Fix archive order bug