fix client auto-switching to new threads