fixed parsing to use data field