Resolves bugs in client to client message sending