         return callback null, workspace
 
 
-  generateUniqueName = ({originId, name, index}, callback)->
+  generateUniqueName = ({originId, machineUId, name, index}, callback)->
 
     slug = if index? then "#{name}-#{index}" else name
     slug = slugify slug
 
-    JWorkspace.count { originId, slug }, (err, count)->
+    JWorkspace.count { originId, slug, machineUId }, (err, count)->
 
       return callback err  if err?
 

    # to prevent storing any kind of data in it. -- acetz!
    data.layout = {}

    generateUniqueName { originId, name }, (err, res)->

      return callback err  if err?


        index ?= 0
        index += 1

        generateUniqueName { originId, machineUId, name, index }, callback


  @fetch = secure (client, query = {}, callback) ->
