Cmd output format fix