BugFix Client class