Wip obj delete fix