Fix for ClientCommand