Fixed double deletion bug?