Fix build failed pt2