Bugfix to client