Client bugfix