join wait fix