[WIP] fix deletion issue