#16 do not mark for deletion twice