Fix issue from merging.