1.17.5-rc, fix 'for' loop