diff --git a/PkmnLibSharp/Native/Linux/libCreatureLib.so b/PkmnLibSharp/Native/Linux/libCreatureLib.so
index 225a39a..d6310e6 100755
--- a/PkmnLibSharp/Native/Linux/libCreatureLib.so
+++ b/PkmnLibSharp/Native/Linux/libCreatureLib.so
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4d2d67e4333a9f50d866204ab06d166f8aa7ffd6c00e3aafa67360198245831
+oid sha256:85559d7babe3faa52fdceec1f6fa72fb31244440236e1ce8595c2ef21a40733a
 size 2466968
diff --git a/PkmnLibSharp/Native/Linux/libpkmnLib.so b/PkmnLibSharp/Native/Linux/libpkmnLib.so
index d69a663..d1fd471 100755
--- a/PkmnLibSharp/Native/Linux/libpkmnLib.so
+++ b/PkmnLibSharp/Native/Linux/libpkmnLib.so
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86693ea5a18b54f46d88610008528540a1203b9b0ea41dc2b1d166b8b8730e21
-size 3566120
+oid sha256:16b9a7f1e8be61bc29c00661fff8a21caed119e5859ed6c4076e26fb5f0bd632
+size 3578768
diff --git a/PkmnLibSharp/Utilities/ReadOnlyNativePtrArray.cs b/PkmnLibSharp/Utilities/ReadOnlyNativePtrArray.cs
index e245df7..0fc9b18 100644
--- a/PkmnLibSharp/Utilities/ReadOnlyNativePtrArray.cs
+++ b/PkmnLibSharp/Utilities/ReadOnlyNativePtrArray.cs
@@ -62,10 +62,10 @@ namespace PkmnLibSharp.Utilities
         {
             for (var i = 0; i < Count; i++)
             {
-                var p = _ptr + (i * IntPtr.Size);
-                if (item == null)
+                var p = GetPtr(i);
+                if (item == null && p == IntPtr.Zero)
                     return i;
-                if (p == item.Ptr)
+                if (p == item?.Ptr)
                     return i;
             }
             return -1;