FOR_EACH Fix