diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDPage.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDPage.java
index ed7023abe..39c2d2120 100644
--- a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDPage.java
+++ b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDPage.java
@@ -237,8 +237,8 @@ private List<PDContentStream> parseContentStream() {
 		GFPDContentStream pdContentStream;
 		if (page.getContent() != null) {
 			PDResourcesHandler resourcesHandler = PDResourcesHandler.getInstance(page.getResources(), page.isInheritedResources());
-			if (!PDFAFlavour.IsoStandardSeries.ISO_14289.equals(StaticContainers.getFlavour().getPart().getSeries()) &&
-			    !PDFAFlavour.WCAG2_1.getPart().getFamily().equals(StaticContainers.getFlavour().getPart().getFamily())) {
+			if (PDFAFlavour.IsoStandardSeries.ISO_14289 != StaticContainers.getFlavour().getPart().getSeries() &&
+			    PDFAFlavour.SpecificationFamily.WCAG != StaticContainers.getFlavour().getPart().getFamily()) {
 				pdContentStream = new GFPDContentStream(page.getContent(), resourcesHandler, null,
 						new StructureElementAccessObject(this.simpleCOSObject));
 			} else {
diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/images/GFPDXForm.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/images/GFPDXForm.java
index d0ba01e11..464e16eb6 100644
--- a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/images/GFPDXForm.java
+++ b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/images/GFPDXForm.java
@@ -200,7 +200,7 @@ private void parseContentStream() {
 		List<PDContentStream> streams = new ArrayList<>(MAX_NUMBER_OF_ELEMENTS);
 		GFPDContentStream gfContentStream;
 		if (!PDFAFlavour.IsoStandardSeries.ISO_14289.equals(StaticContainers.getFlavour().getPart().getSeries()) &&
-		    !PDFAFlavour.WCAG2_1.getPart().getFamily().equals(StaticContainers.getFlavour().getPart().getFamily())) {
+		    PDFAFlavour.SpecificationFamily.WCAG != StaticContainers.getFlavour().getPart().getFamily()) {
 			gfContentStream = new GFPDContentStream(
 					(org.verapdf.pd.images.PDXForm) this.simplePDObject, resourcesHandler,
 					this.inheritedGraphicState, new StructureElementAccessObject(this.simpleCOSObject),