Fix for raw data field