diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFAState.java b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFAState.java
index a2fb7520544..3eba2945b87 100644
--- a/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFAState.java
+++ b/org.eclipse.xtext/src/org/eclipse/xtext/grammaranalysis/impl/AbstractNFAState.java
@@ -170,7 +170,7 @@ protected void collectOutgoingByContainer(AbstractElement element, Set<AbstractE
 					} else {
 						AbstractElement next = siblings.get(i + 1);
 						addOutgoing(next, visited, isRuleCall, loopCenter);
-						if (GrammarUtil.isOptionalCardinality(next))
+						if (GrammarUtil.isOptionalCardinality(next) || container instanceof UnorderedGroup)
 							collectOutgoingByContainer(next, visited, isRuleCall, loopCenter);
 					}
 					break;
@@ -182,7 +182,7 @@ protected void collectOutgoingByContainer(AbstractElement element, Set<AbstractE
 					} else {
 						AbstractElement next = siblings.get(i - 1);
 						addOutgoing(next, visited, isRuleCall, loopCenter);
-						if (GrammarUtil.isOptionalCardinality(next))
+						if (GrammarUtil.isOptionalCardinality(next) || container instanceof UnorderedGroup)
 							collectOutgoingByContainer(next, visited, isRuleCall, loopCenter);
 					}
 					break;