diff --git a/src/UglyToad.PdfPig.sln.DotSettings b/src/UglyToad.PdfPig.sln.DotSettings
new file mode 100644
index 00000000..39e42e16
--- /dev/null
+++ b/src/UglyToad.PdfPig.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XY/@EntryIndexedValue">XY</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/XYNode.cs b/src/UglyToad.PdfPig/DocumentLayoutAnalysis/XYNode.cs
index 70620807..db423c55 100644
--- a/src/UglyToad.PdfPig/DocumentLayoutAnalysis/XYNode.cs
+++ b/src/UglyToad.PdfPig/DocumentLayoutAnalysis/XYNode.cs
@@ -25,29 +25,6 @@ namespace UglyToad.PdfPig.DocumentLayoutAnalysis
         /// </summary>
         public XYNode[] Children { get; set; }
 
-        /// <summary>
-        /// Recursively counts the words included in this node.
-        /// </summary>
-        public virtual int CountWords()
-        {
-            if (Children == null) return 0;
-            int count = 0;
-            RecursiveCount(Children, ref count);
-            return count;
-        }
-
-        /// <summary>
-        /// Recursively gets the leafs (last nodes) of this node.
-        /// </summary>
-        public virtual List<XYLeaf> GetLeafs()
-        {
-            List<XYLeaf> leafs = new List<XYLeaf>();
-            if (Children == null || Children.Count() == 0) return leafs;
-            int level = 0;
-            RecursiveGetLeafs(Children, ref leafs, level);
-            return leafs;
-        }
-
         /// <summary>
         /// Create a new <see cref="XYNode"/>.
         /// </summary>
@@ -79,6 +56,37 @@ namespace UglyToad.PdfPig.DocumentLayoutAnalysis
             }
         }
 
+        /// <summary>
+        /// Recursively counts the words included in this node.
+        /// </summary>
+        public virtual int CountWords()
+        {
+            if (Children == null)
+            {
+                return 0;
+            }
+
+            int count = 0;
+            RecursiveCount(Children, ref count);
+            return count;
+        }
+
+        /// <summary>
+        /// Recursively gets the leafs (last nodes) of this node.
+        /// </summary>
+        public virtual List<XYLeaf> GetLeafs()
+        {
+            List<XYLeaf> leafs = new List<XYLeaf>();
+            if (Children == null || Children.Length == 0)
+            {
+                return leafs;
+            }
+
+            int level = 0;
+            RecursiveGetLeafs(Children, ref leafs, level);
+            return leafs;
+        }
+
         private void RecursiveCount(IEnumerable<XYNode> children, ref int count)
         {
             if (children.Count() == 0) return;
@@ -122,9 +130,10 @@ namespace UglyToad.PdfPig.DocumentLayoutAnalysis
             }
         }
 
+        /// <inheritdoc />
         public override string ToString()
         {
-            return (IsLeaf ? "Leaf" : "Node");
+            return IsLeaf ? "Leaf" : "Node";
         }
     }
 }
diff --git a/src/UglyToad.PdfPig/Encryption/EncryptionDictionaryFactory.cs b/src/UglyToad.PdfPig/Encryption/EncryptionDictionaryFactory.cs
index 735e1d4f..616545d9 100644
--- a/src/UglyToad.PdfPig/Encryption/EncryptionDictionaryFactory.cs
+++ b/src/UglyToad.PdfPig/Encryption/EncryptionDictionaryFactory.cs
@@ -73,11 +73,8 @@
             byte[] userEncryptionBytes = null, ownerEncryptionBytes = null;
             if (revision >= 5)
             {
-                var oe = encryptionDictionary.Get<StringToken>(NameToken.Oe, tokenScanner);
-                var ue = encryptionDictionary.Get<StringToken>(NameToken.Ue, tokenScanner);
-
-                ownerEncryptionBytes = OtherEncodings.StringAsLatin1Bytes(oe.Data);
-                userEncryptionBytes = OtherEncodings.StringAsLatin1Bytes(ue.Data);
+                ownerEncryptionBytes = GetEncryptionBytesOrDefault(encryptionDictionary, tokenScanner, false);
+                userEncryptionBytes = GetEncryptionBytesOrDefault(encryptionDictionary, tokenScanner, true);
             }
 
             encryptionDictionary.TryGetOptionalTokenDirect(NameToken.EncryptMetaData, tokenScanner, out BooleanToken encryptMetadata);
@@ -89,5 +86,21 @@
                 encryptionDictionary,
                 encryptMetadata?.Data ?? true);
         }
+
+        private static byte[] GetEncryptionBytesOrDefault(DictionaryToken encryptionDictionary, IPdfTokenScanner tokenScanner, bool isUser)
+        {
+            var name = isUser ? NameToken.Ue : NameToken.Oe;
+            if (encryptionDictionary.TryGet(name, tokenScanner, out StringToken stringToken))
+            {
+                return OtherEncodings.StringAsLatin1Bytes(stringToken.Data);
+            }
+
+            if (encryptionDictionary.TryGet(name, tokenScanner, out HexToken hexToken))
+            {
+                return hexToken.Bytes.ToArray();
+            }
+
+            return null;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/UglyToad.PdfPig/Tokens/DictionaryToken.cs b/src/UglyToad.PdfPig/Tokens/DictionaryToken.cs
index b8552707..6417e943 100644
--- a/src/UglyToad.PdfPig/Tokens/DictionaryToken.cs
+++ b/src/UglyToad.PdfPig/Tokens/DictionaryToken.cs
@@ -77,6 +77,26 @@
             return Data.TryGetValue(name.Data, out token);
         }
 
+        /// <summary>
+        /// Try and get the entry with a given name and type or look-up the object if it's an indirect reference.
+        /// </summary>
+        internal bool TryGet<T>(NameToken name, IPdfTokenScanner tokenScanner, out T token) where T : IToken
+        {
+            token = default(T);
+            if (!TryGet(name, out var t) || !(t is T typedToken))
+            {
+                if (t is IndirectReferenceToken reference)
+                {
+                    return DirectObjectFinder.TryGet(reference, tokenScanner, out token);
+                }
+
+                return false;
+            }
+
+            token = typedToken;
+            return true;
+        }
+
         /// <summary>
         /// Try and get the entry with a given name and a specific data type.
         /// </summary>