finally fixed data format dependency