Simplify client invocation

From numion 3bfae4c6fadd15f5cb83ca79b7b737c22be6d77f.