[fix] reorder iteration