Fixed an error that resulted from merging.