Fixed bug when using an SQL reserved word as a custom field name