Updated the feature should work correctly