Fix for message corruption.

Differentiate using client socket address.