Fix bug that appeared in the last merge.