Added missing changes in previous commit.