Fixed client stack overflow issue