Fix data field mapping