Avoid hanging on unjoins