Minor improvement of the previous commit.