Added missing changes from previous commit.