diff --git a/app/models/dmsf_lock.rb b/app/models/dmsf_lock.rb
index 1fba2785..2e308fe8 100644
--- a/app/models/dmsf_lock.rb
+++ b/app/models/dmsf_lock.rb
@@ -47,7 +47,7 @@ class DmsfLock < ActiveRecord::Base
   end
 
   def generate_uuid
-    self.uuid = UUIDTools::UUID.timestamp_create().to_s
+    self.uuid = UUIDTools::UUID.random_create.to_s
   end
 
   def self.delete_expired
diff --git a/db/migrate/07_dmsf_1_4_4.rb b/db/migrate/07_dmsf_1_4_4.rb
index 7fc381e7..4dc43b1f 100644
--- a/db/migrate/07_dmsf_1_4_4.rb
+++ b/db/migrate/07_dmsf_1_4_4.rb
@@ -60,7 +60,7 @@ class Dmsf144 < ActiveRecord::Migration
     do_not_delete.each {|l|
       #Find the lock
       next unless lock = DmsfFileLock.find(l)
-      lock.uuid = UUIDTools::UUID.timestamp_create().to_s
+      lock.uuid = UUIDTools::UUID.random_create.to_s
       lock.save!
     }