Follow up of the previous commit.