[Change Request] fasClient fix