Possible fix for ForEachCommand.java