Fix build after merge part2