[clients] improvement