Add fix for nested field value setting