fixed the conversion of data commands