diff --git a/fml/common/cpw/mods/fml/common/Loader.java b/fml/common/cpw/mods/fml/common/Loader.java
index 43c8d68405..1268ed3dc7 100644
--- a/fml/common/cpw/mods/fml/common/Loader.java
+++ b/fml/common/cpw/mods/fml/common/Loader.java
@@ -58,8 +58,8 @@ import cpw.mods.fml.common.toposort.TopologicalSort;
  */
 public class Loader
 {
-    private static Pattern zipJar = Pattern.compile("([^\\s]+).(zip|jar)$");
-    private static Pattern modClass = Pattern.compile("(.*/?)(mod\\_[^\\s]+).class$");
+    private static Pattern zipJar = Pattern.compile("(.+).(zip|jar)$");
+    private static Pattern modClass = Pattern.compile("(.+/|)(mod\\_[^\\s$]+).class$");
 
     /**
      * The state enum used to help track state progression for the loader