Fixes in FOREACH, still not working