Fixed find and delete