Further improvement on previous commit.