Fixed merge error from previous commit.