Add a new test and fix the feature