Fix last commit: unmerged changes.