A slight fix of feature added in previous commit.