Fix client switch error