Idem about this extra loop. I think it is not needed.