Fixed merge problem from previous commit.