C support and test and correct data match