Fixed finder removeAll issue