archive fix bugs