Fix for custom field delete