Framework delete fix