Maybe use the right iterator