Fix compile fail introduced by merge