Build fix after merge issue