Temp client bugfix