Fix: client thread interruption