diff --git a/QtMeshViewer/Source/GeometryEngine.cpp b/QtMeshViewer/Source/GeometryEngine.cpp
index 4cf5e4a4db0b2003d1f789411bd8d9fe9803869e..e2961d7cdaa47948acd01a20163651cea8c15a49 100644
--- a/QtMeshViewer/Source/GeometryEngine.cpp
+++ b/QtMeshViewer/Source/GeometryEngine.cpp
@@ -10,7 +10,7 @@ GeometryEngine::GeometryEngine()
 {
 	initializeOpenGLFunctions();
 
-	loadFile("..\\Release\\Msh\\4-Poly.msh");
+	loadFile("..\\Release\\Msh\\5-Poly.msh");
 }
 
 GeometryEngine::~GeometryEngine()
diff --git a/QtMeshViewer/Source/MshFile.cpp b/QtMeshViewer/Source/MshFile.cpp
index d308afdc97c32fa542a8385b323a304403c4eb86..b8b110523775720f2b03193ff4042663f527ce42 100644
--- a/QtMeshViewer/Source/MshFile.cpp
+++ b/QtMeshViewer/Source/MshFile.cpp
@@ -452,11 +452,7 @@ void MshFile::analyseSegmChunks(Model * dataDestination, std::list<ChunkHeader*>
 						for (unsigned int tri = 0; tri < tmp_multiPolySize - 2; tri++)
 							// ..calculate the edge indices
 							for (int triEdge = 0; triEdge < 3; triEdge++)
-								new_segment->indices.push_back((GLuint)(tri + triEdge - ((tri % 2) * (triEdge - 1) * 2)));
-					}
-					else
-					{
-						//TODO: this shouldn't happen only once
+								new_segment->indices.push_back((GLuint)tmp_buffer[(tri + triEdge - ((tri % 2) * (triEdge - 1) * 2))]);
 					}
 
 				}	// if 2 high bits are set
@@ -478,11 +474,6 @@ void MshFile::analyseSegmChunks(Model * dataDestination, std::list<ChunkHeader*>
 					for (int triEdge = 0; triEdge < 3; triEdge++)
 						new_segment->indices.push_back((GLuint)tmp_buffer[(tri + triEdge - ((tri % 2) * (triEdge - 1) * 2))]);
 			}
-			else
-			{
-				//TODO: this shouldn't happen
-				std::cout << "Where am i??" << std::endl;
-			}
 		}
 	}