SDK Client extended fix