Fix refactoring pb.