Changed same function as in previous commit.