Client executor fix/3.x