MOdied CPS_Client to fix defect as per niranjan's sugesstion.