Fixing new feature