BugFixing in client mesh - Part I