Merge "Fix iterator misuse"