Fix the iterator breakage