save choking on list update, but disable for now anyway