CLIENT bugfix