Fix last merge issue