Fixing Delete all option