Fix missed merge issue in last merge