Bugfix Client