bugfix with clients