diff --git a/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
index 9ca3140..b280c75 100644
--- a/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.uml; singleton:=true
-Bundle-Version: 3.1.1.qualifier
+Bundle-Version: 3.1.2.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.uml2.uml.UMLPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java
index c6e02f1..afd787c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java
@@ -8,9 +8,9 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 205188, 204200
- *   Kenn Hussey - 286329, 320318
+ *   Kenn Hussey - 286329, 320318, 323000
  *
- * $Id: UMLValidator.java,v 1.28.2.2 2010/08/19 18:54:38 khussey Exp $
+ * $Id: UMLValidator.java,v 1.28.2.3 2010/10/26 20:30:21 khussey Exp $
  */
 package org.eclipse.uml2.uml.util;
 
@@ -4538,8 +4538,16 @@
 	public boolean validate_BidirectionalReferenceIsPaired(EObject eObject,
 			EReference eReference, EReference eOpposite,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		// XXX 320318 - work around missing subsets constraints
-		return eReference == UMLPackage.Literals.ELEMENT__OWNER
+		// XXX 320318, 323000 - work around missing subsets constraints
+		return eReference == UMLPackage.Literals.ACTIVITY_EDGE__IN_GROUP
+			|| eReference == UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_EDGE
+			|| eReference == UMLPackage.Literals.ACTIVITY_NODE__IN_GROUP
+			|| eReference == UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_NODE
+			|| eReference == UMLPackage.Literals.ACTIVITY_GROUP__SUBGROUP
+			|| eReference == UMLPackage.Literals.ACTIVITY_GROUP__SUPER_GROUP
+			|| eReference == UMLPackage.Literals.CLASSIFIER__FEATURE
+			|| eReference == UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER
+			|| eReference == UMLPackage.Literals.ELEMENT__OWNER
 			|| eReference == UMLPackage.Literals.ELEMENT__OWNED_ELEMENT
 			|| eReference == UMLPackage.Literals.NAMED_ELEMENT__NAMESPACE
 			|| eReference == UMLPackage.Literals.NAMESPACE__OWNED_MEMBER