Added queue parameter when stopping client