Added another layer of detachment for when mediators are changed