diff --git a/PdfSharpCore/Pdf.Advanced/PdfFormXObject.cs b/PdfSharpCore/Pdf.Advanced/PdfFormXObject.cs
index 3a041ca9..3e18d762 100644
--- a/PdfSharpCore/Pdf.Advanced/PdfFormXObject.cs
+++ b/PdfSharpCore/Pdf.Advanced/PdfFormXObject.cs
@@ -212,9 +212,9 @@ internal PdfFormXObject(PdfDocument thisDocument, PdfImportedObjectTable importe
 
                 // Translate the image such that its center lies on the center of the rotated bounding box
                 double offset = (height - width) / 2;
-                if (height > width)
+                if (rotate == 90)
                     matrix.TranslatePrepend(offset, offset);
-                else
+                else if (rotate == -90)
                     matrix.TranslatePrepend(-offset, -offset);
 
                 //string item = "[" + PdfEncoders.ToString(matrix) + "]";
diff --git a/PdfSharpCore/Pdf/PdfPage.cs b/PdfSharpCore/Pdf/PdfPage.cs
index 94edfe8e..1d69ecb3 100644
--- a/PdfSharpCore/Pdf/PdfPage.cs
+++ b/PdfSharpCore/Pdf/PdfPage.cs
@@ -72,8 +72,7 @@ internal PdfPage(PdfDictionary dict)
         {
             // Set Orientation depending on /Rotate.
             int rotate = Elements.GetInteger(InheritablePageKeys.Rotate);
-            var mediaBox = Elements.GetArray(InheritablePageKeys.MediaBox);
-            if (Math.Abs((rotate / 90)) % 2 == 1 && mediaBox.Elements.GetReal(3) > mediaBox.Elements.GetReal(2))
+            if (Math.Abs((rotate / 90)) % 2 == 1)
                 _orientation = PageOrientation.Landscape;
         }