Fixed bad compile after merge.