further client bugfix