Bugfix Clientmanager