Client side socket fix