Improvement of previous commit.