Fix bug with recursive archive/unarchive