Update CF#270