diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/core/ParameterSet.java b/src/main/java/de/hhu/ba/yoshikoWrapper/core/ParameterSet.java
index 08ac18a7aa2ab569817cdbee9f7f90dcf7467331..a3bb7fa6cf3e324f4dd72c32f0c47081095bca5e 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/core/ParameterSet.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/core/ParameterSet.java
@@ -14,7 +14,7 @@ public class ParameterSet implements TunableValidator
 	public int timeLimit = -1;
 
 	@Tunable(description="A column in the edge table containing weights", context="nogui")
-	public CyColumn weightColumn;
+	public String weightColumnName;
 	@Tunable(description="A column containing boolean entries for edges that are to be treated as permanent",context="nogui")
 	public CyColumn permanentColumn;
 	@Tunable(description="A column containing boolean entries for edges that are to be treated as forbidden",context="nogui")
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/MainPanel.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/MainPanel.java
index b0771da0950f3cb95c9a366a511cd6ddbd8095fb..0efd7a5ebe459ca6abf1dea4ce09e1686abab805 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/MainPanel.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/MainPanel.java
@@ -346,7 +346,7 @@ public class MainPanel extends JPanel implements CytoPanelComponent {
 	private ParameterSet fetchParameters(CyNetwork net) {
 		ParameterSet ret = new ParameterSet();
 		ret.timeLimit = opModePanel.getTimeLimit();
-		ret.weightColumn = ecPanel.getWeightColumn();
+		ret.weightColumnName = ecPanel.getWeightColumn().getName();
 		ret.permanentColumn = ecPanel.getPermanentColumn();
 		ret.forbiddenColumn = ecPanel.getForbiddenColumn();
 		ret.defaultInsertionCost = ecPanel.getDefaultInsertionCost();
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/SolutionTab.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/SolutionTab.java
index b0c4e99dbff3253d9d1a970dacb22f665ae70217..86650f2e9bc0cff915607b316e3039bd7d516415 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/SolutionTab.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/SolutionTab.java
@@ -226,6 +226,9 @@ public class SolutionTab extends JPanel {
 		this.setLayout(layout);
 	}
 
+	/**
+	 * Simply disables the CCV and CMG graph to visually highlight the fact that those tasks are no longer possible
+	 */
 	public void invalidateResult() {
 		createClusterView.setEnabled(false);
 		createMetaGraph.setEnabled(false);
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/tasks/AlgorithmTask.java b/src/main/java/de/hhu/ba/yoshikoWrapper/tasks/AlgorithmTask.java
index d764f9e387b34b9411110f0fd78a14efcfbc81f4..cbc64bb4d4c4a3a8afcfa969ec50940d393701ae 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/tasks/AlgorithmTask.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/tasks/AlgorithmTask.java
@@ -138,7 +138,7 @@ public class AlgorithmTask extends AbstractTask implements ObservableTask {
 		c_input = NetworkParser.parseNetwork(
 				net,
 				nodeMap,
-				parameterSet.weightColumn,
+				net.getDefaultEdgeTable().getColumn(parameterSet.weightColumnName),
 				parameterSet.permanentColumn,
 				parameterSet.forbiddenColumn,
 				parameterSet.defaultDeletionCost
@@ -147,7 +147,7 @@ public class AlgorithmTask extends AbstractTask implements ObservableTask {
 
 		boolean containsRealValues = GraphAnalyzer.containsRealValues(
 				net,
-				parameterSet.weightColumn,
+				net.getDefaultEdgeTable().getColumn(parameterSet.weightColumnName),
 				parameterSet.permanentColumn,
 				parameterSet.forbiddenColumn,
 				parameterSet.defaultInsertionCost,
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/tasks/CreateMetaGraphTask.java b/src/main/java/de/hhu/ba/yoshikoWrapper/tasks/CreateMetaGraphTask.java
index cf0ffb6193fca40221fd1adfa86e988847b5c967..dd1c24e4b543ed1fa48a5b106ed32d1e00f0b748 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/tasks/CreateMetaGraphTask.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/tasks/CreateMetaGraphTask.java
@@ -20,6 +20,8 @@ import de.hhu.ba.yoshikoWrapper.cytoUtil.StyleManager;
 import de.hhu.ba.yoshikoWrapper.graphModel.YoshikoCluster;
 import de.hhu.ba.yoshikoWrapper.graphModel.YoshikoSolution;
 
+//TODO: Should also not be possible / throw an exception if the result was invalidated (might currently just be disabled via GUI)
+
 public class CreateMetaGraphTask extends AbstractTask{
 
 	private final YoshikoSolution solution;