Fixed duplicate find/match/delete