Fix build error part2