Fix from the new feature