diff --git a/app/src/main/java/model/DistinctColorGenerator.java b/app/src/main/java/model/DistinctColorGenerator.java
index c8f60f9916f1cfae8f08ebb6018e0e4d71dea69c..792f3afba04dae761f7fc33c9ff41e71440b7a30 100644
--- a/app/src/main/java/model/DistinctColorGenerator.java
+++ b/app/src/main/java/model/DistinctColorGenerator.java
@@ -19,7 +19,7 @@ public class DistinctColorGenerator implements ColorGenerator {
         for (Color color : this.colors) {
             boolean cellNotUsed = true;
             for (Cell newCell : neighbours) {
-                if (color==cell.getColor())
+                if (color==newCell.getColor())
                 { cellNotUsed = false; }
             }
             if (cellNotUsed == true) {
diff --git a/app/src/main/java/model/UniformExceptOneGenerator.java b/app/src/main/java/model/UniformExceptOneGenerator.java
index 336ded42e079262f728c1a51f0c20728be56656a..be38373734e8d8d83a9fd31f8b35331525c039ac 100644
--- a/app/src/main/java/model/UniformExceptOneGenerator.java
+++ b/app/src/main/java/model/UniformExceptOneGenerator.java
@@ -18,7 +18,7 @@ public class UniformExceptOneGenerator implements ColorGenerator{
     public Color nextColor(Cell cell) {
         counter++;
         if(counter==2){
-            return this.uniColor;
+            return this.excepColor;
         }
-        return this.excepColor;    }
+        return this.uniColor;    }
 }