Command proxy client fix

@jlipps can you check.