Small fix in last merge