JOJ110: Fix disconnect bug