Fixed an issue from the merge.