more client fixing