Client side socket fix2