Foreach hotfix