     kd.utils.defer =>
       environmentDataProvider.fetchMachineByUId @mountedMachineUId, (machine, ws) =>
         machine = new Machine { machine }  unless machine instanceof Machine
-        @mountedMachine = machine
-
-        callback null, @mountedMachine
+        @setMountedMachine machine
+
+        callback null, machine
 
 
   mountMachineByMachineUId: (machineUId) ->

      unless machineItem instanceof Machine
        machineItem = new Machine machine: machineItem

      @mountedMachine = machineItem

      @prepareIDE()


              pane.isInitial = yes


  setMountedMachine: (machine) ->

    @mountedMachine = machine
    @emit 'MachineDidMount', machine, @workspaceData


  getMountedMachine: (callback = noop) ->

    return callback()  unless @mountedMachineUId
