diff --git a/solanaceae/ngc_ft1_sha1/chunk_picker_systems.cpp b/solanaceae/ngc_ft1_sha1/chunk_picker_systems.cpp
index 44f44fc..b2e3f8a 100644
--- a/solanaceae/ngc_ft1_sha1/chunk_picker_systems.cpp
+++ b/solanaceae/ngc_ft1_sha1/chunk_picker_systems.cpp
@@ -38,7 +38,7 @@ void chunk_picker_updates(
 
 		//std::cout << "cput :)\n";
 
-		if (!c.any_of<Contact::Components::ToxGroupPeerEphemeral, Contact::Components::FT1Participation>()) {
+		if (!c.all_of<Contact::Components::ToxGroupPeerEphemeral, Contact::Components::FT1Participation>()) {
 			std::cout << "cput uh nuh :(\n";
 			cp_to_remove.push_back(c);
 			return;
@@ -55,7 +55,7 @@ void chunk_picker_updates(
 	cr.view<ChunkPicker, ChunkPickerUpdateTag>().each([&cr, &os_reg, &peer_open_requests, &receiving_transfers, &nft, &cp_to_remove](const Contact3 cv, ChunkPicker& cp) {
 		Contact3Handle c{cr, cv};
 
-		if (!c.all_of<Contact::Components::ToxGroupPeerEphemeral, Contact::Components::FT1Participation>()) {
+		if (!c.all_of<Contact::Components::ToxGroupPeerEphemeral, Contact::Components::FT1Participation, Components::FT1ChunkSHA1Cache, Components::FT1InfoSHA1>()) {
 			cp_to_remove.push_back(c);
 			return;
 		}