diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetryResults.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetryResults.java
index <HASH>..<HASH> 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetryResults.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetryResults.java
@@ -98,6 +98,11 @@ public class QuatSymmetryResults {
 		this.clusters = clusters;
 		this.stoichiometry = SubunitClusterUtils
 				.getStoichiometryString(clusters);
+		
+		subunits = new ArrayList<Subunit>();
+		for (SubunitCluster c : clusters) {
+			subunits.addAll(c.getSubunits());
+		}
 
 		this.helixLayers = helixLayers;
 		this.method = method;
@@ -117,11 +122,8 @@ public class QuatSymmetryResults {
 	 *
 	 * @return an unmodifiable view of the List
 	 */
-	public List<Subunit> getSubunits() {
-		if (subunits != null)
-			return Collections.unmodifiableList(subunits);
-		else
-			return Collections.unmodifiableList(new ArrayList<>());
+	public List<Subunit> getSubunits() {		
+		return Collections.unmodifiableList(subunits);		
 	}
 	
 	/**
Better fix for null subunits as advised by @lafita