PS-2 Adopted to changes of flexiant client