Join self on stop to prevent a race condition