diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/FieldSynchronizer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/FieldSynchronizer.kt
index 3f6b3f57f..9e9427b2a 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/FieldSynchronizer.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/FieldSynchronizer.kt
@@ -369,17 +369,7 @@ class FieldSynchronizer(private val callback: Runnable, private val alwaysCallCa
 		nextEndpointsCleanup = secondTime + 60
 
 		synchronized(endpoints) {
-			val iterator = endpoints.listIterator()
-
-			for (value in iterator) {
-				val endpoint = value.get()
-
-				if (endpoint == null) {
-					iterator.remove()
-				} else {
-					execute.invoke(endpoint)
-				}
-			}
+			endpoints.forValidRefs { execute.invoke(it) }
 
 			if (endpoints.size < endpointsMaxCapacity / 2) {
 				endpoints.trimToSize()