diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b5bbff251..26484bb12 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -25,13 +25,13 @@ jobs:
        sudo apt install autotools-dev autopoint cmake libtool pkg-config libcups2-dev libexif-dev liblcms2-dev libfontconfig1-dev
        sudo apt install libfreetype6-dev build-essential qtbase5-dev qtchooser libcairo2-dev libboost-system-dev libboost-thread-dev libboost-program-options-dev libboost-test-dev libopenjp2-7-dev liblcms2-dev libjpeg-dev
        sudo apt install -y libjxl-dev
-    - name: Install pdfio >= 1.6.0
+    - name: Install pdfio >= 1.6.2
       run: |
         cd ..
         mkdir pdfio
-        wget https://github.com/michaelrsweet/pdfio/releases/download/v1.6.0/pdfio-1.6.0.tar.gz
-        tar -xzf pdfio-1.6.0.tar.gz
-        cd pdfio-1.6.0
+        wget https://github.com/michaelrsweet/pdfio/releases/download/v1.6.2/pdfio-1.6.2.tar.gz
+        tar -xzf pdfio-1.6.2.tar.gz
+        cd pdfio-1.6.2
         ./configure --prefix=/usr --enable-shared
         make all
         make test
diff --git a/configure.ac b/configure.ac
index 9c074e16b..5ebbca890 100644
--- a/configure.ac
+++ b/configure.ac
@@ -325,7 +325,7 @@ AS_IF([test x"$with_fontconfig" != "xno" && test "x$enable_texttopdf" != "xno"],
 	AC_DEFINE([HAVE_FONTCONFIG], [1], [Defines if we are using fontconfig.])
   PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.0.0])
 ])
-PKG_CHECK_MODULES([LIBPDFIO], [pdfio >= 1.6.0])
+PKG_CHECK_MODULES([LIBPDFIO], [pdfio >= 1.6.2])
 
 
 # =================
diff --git a/cupsfilters/pdftopdf.c b/cupsfilters/pdftopdf.c
index 9a977bf10..58bc134e4 100644
--- a/cupsfilters/pdftopdf.c
+++ b/cupsfilters/pdftopdf.c
@@ -2467,7 +2467,7 @@ prepare_documents(
       }
     }
 
-    if (p.has_form || p.has_annotations)
+    if (p.has_form && p.has_annotations)
     {
       if ((flattened_pdf = pdfioFileCreateTemporary(flattened_pdf_file, sizeof(flattened_pdf_file), "1.7", &p.media, &p.media, pdfio_error_cb, &p)) == NULL)
 	return (false);
diff --git a/cupsfilters/test_files/form_english.pdf b/cupsfilters/test_files/form_english.pdf
index 6d278e89b..8d576de29 100644
Binary files a/cupsfilters/test_files/form_english.pdf and b/cupsfilters/test_files/form_english.pdf differ