Fixed a bug with custom data fields.