Dirty bugfix for client proxy selection/creation.