Resolve deletion issue