Fix missed merge issue