Fixing error when deleting field values see BT#7975