fix for client messages with same xid