diff --git a/db_fileutil.go b/db_fileutil.go
index eb7ac1c..9399aae 100644
--- a/db_fileutil.go
+++ b/db_fileutil.go
@@ -3,7 +3,6 @@ package main
 
 import (
   "labix.org/v2/mgo/bson"
-  "math/rand"
 )
 
 /* gfs is a *mgo.GridFS defined in imgsrv.go */
@@ -17,7 +16,7 @@ func GetFileByFilename(filename string) (this_file File, err error) {
 }
 
 func GetFileRandom() (this_file File, err error) {
-  r := rand.Int63()
+  r := Rand64()
   err = gfs.Find(bson.M{"random": bson.M{"$gt" : r } }).One(&this_file)
   if (err != nil) {
     return this_file, err
diff --git a/hash.go b/hash.go
index 5ff5eb7..03c6350 100644
--- a/hash.go
+++ b/hash.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+  "math/rand"
   "crypto/md5"
   "fmt"
   "hash/adler32"
@@ -8,6 +9,10 @@ import (
   "time"
 )
 
+func Rand64() int64 {
+  return rand.Int63()
+}
+
 /* Convinience method for getting md5 sum of a string */
 func GetMd5FromString(blob string) (sum []byte) {
   h := md5.New()
diff --git a/server.go b/server.go
index 974f965..34215d1 100644
--- a/server.go
+++ b/server.go
@@ -6,7 +6,6 @@ import (
   "labix.org/v2/mgo"
   "labix.org/v2/mgo/bson"
   "log"
-  "math/rand"
   "mime"
   "net/http"
   "os"
@@ -143,7 +142,7 @@ func routeFilesPOST(w http.ResponseWriter, r *http.Request) {
   var filename string
   info := Info{
     Ip: r.RemoteAddr,
-    Random: rand.Int63(),
+    Random: Rand64(),
     TimeStamp: time.Now(),
   }
 
@@ -434,7 +433,7 @@ func routeGetFromUrl(w http.ResponseWriter, r *http.Request) {
   if (r.Method == "POST") {
     info := Info{
       Ip: r.RemoteAddr,
-      Random: rand.Int63(),
+      Random: Rand64(),
       TimeStamp: time.Now(),
     }
     log.Println(info)
@@ -513,7 +512,7 @@ func routeUpload(w http.ResponseWriter, r *http.Request) {
   if (r.Method == "POST") {
     info := Info{
       Ip: r.RemoteAddr,
-      Random: rand.Int63(),
+      Random: Rand64(),
       TimeStamp: time.Now(),
     }