diff --git a/src/main.cpp b/src/main.cpp
index 563d930..a0a7710 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -84,10 +84,10 @@ void setup_layout() {
 				if (e2<0) e2+=CORNERS_PER_PART;
 
 				LOGln("      Mapping Corner #%d,%d with #%d,%d", n1->_number, edge, found->_number, e2);
-				n1->_corners[edge]->_short_neighbours.push_back(found->_corners[e]);
+				n1->_corners[edge]->_short_neighbours.push_back(found->_corners[e2]);
 				
 				LOGln("      Mapping Corner #%d,%d with #%d,%d", n1->_number, e1, found->_number, e);
-				n1->_corners[e1]->_short_neighbours.push_back(found->_corners[e2]);
+				n1->_corners[e1]->_short_neighbours.push_back(found->_corners[e]);
 			} else {
 				LOGln("    No match.");
 			}