diff --git a/fml/src/main/java/net/minecraftforge/fml/common/discovery/DirectoryDiscoverer.java b/fml/src/main/java/net/minecraftforge/fml/common/discovery/DirectoryDiscoverer.java
index 4608233bd..2ed403cbf 100644
--- a/fml/src/main/java/net/minecraftforge/fml/common/discovery/DirectoryDiscoverer.java
+++ b/fml/src/main/java/net/minecraftforge/fml/common/discovery/DirectoryDiscoverer.java
@@ -38,7 +38,7 @@ public class DirectoryDiscoverer implements ITypeDiscoverer
         @Override
         public boolean accept(File file)
         {
-            return (file.isFile() && classFile.matcher(file.getName()).find()) || file.isDirectory();
+            return (file.isFile() && classFile.matcher(file.getName()).matches()) || file.isDirectory();
         }
     }
 
diff --git a/fml/src/main/java/net/minecraftforge/fml/common/discovery/ITypeDiscoverer.java b/fml/src/main/java/net/minecraftforge/fml/common/discovery/ITypeDiscoverer.java
index 144526a72..844d21bc0 100644
--- a/fml/src/main/java/net/minecraftforge/fml/common/discovery/ITypeDiscoverer.java
+++ b/fml/src/main/java/net/minecraftforge/fml/common/discovery/ITypeDiscoverer.java
@@ -19,7 +19,7 @@ import net.minecraftforge.fml.common.ModContainer;
 
 public interface ITypeDiscoverer
 {
-    public static Pattern classFile = Pattern.compile("([^\\s$]+).class$");
+    public static Pattern classFile = Pattern.compile("[^\\s]+\\.class$");
 
     public List<ModContainer> discover(ModCandidate candidate, ASMDataTable table);
 }