B: Partial fix bugs for deletion