FixCommand - stop corrupting xml/json format