diff --git a/src/ui/MainGUI.java b/src/ui/MainGUI.java
index 5fb4c1e00094e039744c0b7485f719f62ac3fc63..51dbc5a78e1dd5f3f03b835ad02e28b99ba5a02b 100755
--- a/src/ui/MainGUI.java
+++ b/src/ui/MainGUI.java
@@ -6267,6 +6267,7 @@ public	class MainGUI implements ActionListener, WindowListener, KeyListener {
 		LoadInfo li = new LoadInfo();
 		li.id = _id;
 		li.load = _load;
+		li.energy = _energy;
 		loadIDs.add(li);
 		//TraceManager.addDev("Running id " + _id +  " added load=" + _load);
 		TDiagramPanel tdp = getCurrentTDiagramPanel();
diff --git a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
index 2671def33adc1e63e4380cdb168ee81adef81dad..e085b6ddefcae9c5212a5a64ef3b658f966dcba4 100755
--- a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
+++ b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
@@ -1507,7 +1507,7 @@ public	class JFrameInteractiveSimulation extends JFrame implements ActionListene
 							nl = elt.getElementsByTagName("energy");
 							if ((nl != null) && (nl.getLength() > 0)) {
 								node0 = nl.item(0);
-								//System.out.println("nl:" + nl + " value=" + node0.getNodeValue() + " content=" + node0.getTextContent());
+								//System.out.println("energy NL? nl:" + nl + " value=" + node0.getNodeValue() + " content=" + node0.getTextContent());
 								usedEnergy = node0.getTextContent();
 							}
 							
@@ -2261,7 +2261,7 @@ public	class JFrameInteractiveSimulation extends JFrame implements ActionListene
 				//System.out.println("Searching for old row");
 				row = (Integer)(rowTable.get(i)).intValue();
 				cputm.fireTableCellUpdated(row, 2);
-				if (_usedEnergy != null) {
+				if (_usedEnergy == null) {
 					mgui.addLoadInfo(i, getDouble(_utilization).doubleValue(), -1);
 				} else {
 					mgui.addLoadInfo(i, getDouble(_utilization).doubleValue(), getLong(_usedEnergy).longValue());