More ownerhship fix
Differentiate closed vs detached