Fixed FOR_EACH call