diff --git a/build/build.xml b/build/build.xml
index 050a555..596f61b 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -173,8 +173,11 @@
         <condition property="java.not.ok" value="true">
             <not>
                 <or>
+                    <contains string="${ant.java.version}" substring="1.5"/>
+                    <contains string="${ant.java.version}" substring="1.6"/>
                     <contains string="${ant.java.version}" substring="1.7"/>
                     <contains string="${ant.java.version}" substring="1.8"/>
+                    <contains string="${ant.java.version}" substring="1.9"/>
                 </or>
             </not>
         </condition>
@@ -213,8 +216,8 @@
             destdir="${compile.dir}"
             includeAntRuntime="no"
             debug="on"
-            source="1.7"
-            target="1.7"
+            source="1.5"
+            target="1.5"
             encoding="UTF-8"
             >
             <src path="${src.java.dir}"/>
diff --git a/src/java/org/jivesoftware/multiplexer/StreamIDFactory.java b/src/java/org/jivesoftware/multiplexer/StreamIDFactory.java
index 2e3da60..f3bf2d5 100644
--- a/src/java/org/jivesoftware/multiplexer/StreamIDFactory.java
+++ b/src/java/org/jivesoftware/multiplexer/StreamIDFactory.java
@@ -35,14 +35,16 @@
  */
 public class StreamIDFactory {
 
-    private static final ConcurrentHashMap<String, Boolean> usingStreamIDs = new ConcurrentHashMap<>();
+    private static final ConcurrentHashMap<String, Boolean> usingStreamIDs = new ConcurrentHashMap<String, Boolean>();
 
     String managerName = ConnectionManager.getInstance().getName();
 
+    private Random rand = new Random();
+
     public String createStreamID() {
         String streamID;
         do {
-            streamID = managerName + Integer.toHexString(ThreadLocalRandom.current().nextInt());
+            streamID = managerName + Integer.toHexString(rand.nextInt());
         } while(usingStreamIDs.putIfAbsent(streamID, Boolean.TRUE) == null);
         return streamID;
     }