1 files changed, 2 insertions, 2 deletions

diff --git a/src/entity.rs b/src/entity.rs
index b3e3359..1c2eb7a 100644
--- a/src/entity.rs
+++ b/src/entity.rs
@@ -172,12 +172,12 @@ macro_rules! entity {
 							return;
 						};
 
-						let last = item;
+						let last = item.id(token);
 						while {
 							let next_item = item.next(token);
 							f(item, token);
 							item = next_item;
-							!item.eq(last, token)
+							matches!(item.maybe_id(token), Some(x) if x != last)
 						} {}
 					}