client fix part 1