Fixing bug of not passing parameters to Client