Adding fields to avoid see BT#6449