3 files changed, 4 insertions, 4 deletions
diff --git a/frontend/src/containers/app/sidebars/topology/machine/MachineSidebarContainer.js b/frontend/src/containers/app/sidebars/topology/machine/MachineSidebarContainer.js
index f5baee44..a39bd2d6 100644
--- a/frontend/src/containers/app/sidebars/topology/machine/MachineSidebarContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/machine/MachineSidebarContainer.js
@@ -6,7 +6,7 @@ const mapStateToProps = state => {
         inSimulation: state.currentExperimentId !== -1,
         machineId:
             state.objects.rack[
-                state.objects.tile[state.interactionLevel.tileId].objectId
+                state.objects.tile[state.interactionLevel.tileId].rackId
                 ].machineIds[state.interactionLevel.position - 1],
     }
 }
diff --git a/frontend/src/containers/app/sidebars/topology/machine/UnitContainer.js b/frontend/src/containers/app/sidebars/topology/machine/UnitContainer.js
index 1a01cad0..d8e549a7 100644
--- a/frontend/src/containers/app/sidebars/topology/machine/UnitContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/machine/UnitContainer.js
@@ -4,8 +4,8 @@ import UnitComponent from '../../../../../components/app/sidebars/topology/machi
 
 const mapStateToProps = (state, ownProps) => {
     return {
-        unit: state.objects[ownProps.unitType][ownProps.unitId],
         inSimulation: state.currentExperimentId !== -1,
+        unit: state.objects[ownProps.unitType][ownProps.unitId],
     }
 }
 
diff --git a/frontend/src/containers/app/sidebars/topology/machine/UnitListContainer.js b/frontend/src/containers/app/sidebars/topology/machine/UnitListContainer.js
index fce657d4..2f11a22f 100644
--- a/frontend/src/containers/app/sidebars/topology/machine/UnitListContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/machine/UnitListContainer.js
@@ -3,13 +3,13 @@ import UnitListComponent from '../../../../../components/app/sidebars/topology/m
 
 const mapStateToProps = (state, ownProps) => {
     return {
+        inSimulation: state.currentExperimentId !== -1,
         unitIds:
             state.objects.machine[
                 state.objects.rack[
-                    state.objects.tile[state.interactionLevel.tileId].objectId
+                        state.objects.tile[state.interactionLevel.tileId].rackId
                     ].machineIds[state.interactionLevel.position - 1]
                 ][ownProps.unitType + 'Ids'],
-        inSimulation: state.currentExperimentId !== -1,
     }
 }