Correct client related topology