Fixed the new feature