Fixed arhiving issue