Fixed issue with last merge.