Fix find clients