fix little bug on ClientCommunicationmanager
Try to fix problem in Git conflict but failed
update the distribution