Fix deletion issue