Fixing client routing