diff --git a/project/ScalaLibraryPlugin.scala b/project/ScalaLibraryPlugin.scala
index bbc5db0fa5db..8907eea02bf3 100644
--- a/project/ScalaLibraryPlugin.scala
+++ b/project/ScalaLibraryPlugin.scala
@@ -51,7 +51,8 @@ object ScalaLibraryPlugin extends AutoPlugin {
         (files, reference) <- patches
         file <- files
         id <- file.relativeTo(reference)
-        if filesToCopy(id.toString().replace("\\", "/")) // Only Override Some Very Specific Files
+        path = id.toString().replace("\\", "/").stripSuffix(".class").stripSuffix(".sjsir")
+        if filesToCopy.exists(s => path == s || path.startsWith(s + '$')) // Only Override Some Very Specific Files
         dest = target / (id.toString)
         ref <- dest.relativeTo((LocalRootProject / baseDirectory).value)
       } {
@@ -111,7 +112,7 @@ object ScalaLibraryPlugin extends AutoPlugin {
     "scala/collection/immutable/DoubleVectorStepper",
     "scala/collection/immutable/IntVectorStepper",
     "scala/collection/immutable/LongVectorStepper",
-    "scala/collection/immutable/Range", "scala/collection/immutable/Range$",
+    "scala/collection/immutable/Range",
     "scala/jdk/DoubleAccumulator",
     "scala/jdk/IntAccumulator",
     "scala/jdk/LongAccumulator",
@@ -139,7 +140,7 @@ object ScalaLibraryPlugin extends AutoPlugin {
     "scala/jdk/FunctionWrappers$FromJavaLongUnaryOperator",
     "scala/collection/ArrayOps$ReverseIterator",
     "scala/runtime/NonLocalReturnControl",
-    "scala/util/Sorting", "scala/util/Sorting$",
-    ).flatMap(f => Seq(s"$f.class", s"$f.sjsir"))
+    "scala/util/Sorting",
+    )
 
 }