Fixed address deletion issue