diff --git a/.gitsplit.yml b/.gitsplit.yml
index ce253cf0..c11a97f9 100644
--- a/.gitsplit.yml
+++ b/.gitsplit.yml
@@ -57,5 +57,5 @@ splits:
     target: "https://${GH_TOKEN}@github.com/web-token/signature-pack.git"
 
 origins:
-  - ^\d+\.\d+\.x$
-  - ^\d+\.\d+\.\d+$
+  - ^(1|2|3)\.\d+\.x$
+  - ^(1|2|3)\.\d+\.\d+$
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 77134450..d7e10bd9 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1673,11 +1673,6 @@ parameters:
 			count: 2
 			path: src/Library/Core/Util/Base64UrlSafe.php
 
-		-
-			message: "#^Instantiated class Jose\\\\Component\\\\Core\\\\Util\\\\RangeException not found\\.$#"
-			count: 3
-			path: src/Library/Core/Util/Base64UrlSafe.php
-
 		-
 			message: "#^Method Jose\\\\Component\\\\Core\\\\Util\\\\Base64UrlSafe\\:\\:safeSubstr\\(\\) has parameter \\$length with no type specified\\.$#"
 			count: 1
@@ -1688,11 +1683,6 @@ parameters:
 			count: 2
 			path: src/Library/Core/Util/Base64UrlSafe.php
 
-		-
-			message: "#^Throwing object of an unknown class Jose\\\\Component\\\\Core\\\\Util\\\\RangeException\\.$#"
-			count: 3
-			path: src/Library/Core/Util/Base64UrlSafe.php
-
 		-
 			message: "#^Variable \\$i might not be defined\\.$#"
 			count: 2
diff --git a/src/Library/Core/Util/Base64UrlSafe.php b/src/Library/Core/Util/Base64UrlSafe.php
index d7863ad3..e6a6b368 100644
--- a/src/Library/Core/Util/Base64UrlSafe.php
+++ b/src/Library/Core/Util/Base64UrlSafe.php
@@ -27,6 +27,8 @@
  *  SOFTWARE.
  */
 
+use RangeException;
+
 /**
  * @readonly
  */