Fix CommandBusClient bug