Minor change to the socket flow