diff --git a/source/model/modelfinalization.js b/source/model/modelfinalization.js
index 0306bd5..a3bda36 100644
--- a/source/model/modelfinalization.js
+++ b/source/model/modelfinalization.js
@@ -34,7 +34,6 @@ OV.FinalizeModel = function (model, getDefaultMaterial)
                 for (let i = 0; i < averageNormals.length; i++) {
                     averageNormal = OV.AddCoord3D (averageNormal, averageNormals[i]);
                 }
-                
                 averageNormal.MultiplyScalar (1.0 / averageNormals.length);
                 averageNormal.Normalize ();
                 return mesh.AddNormal (averageNormal);
@@ -61,7 +60,7 @@ OV.FinalizeModel = function (model, getDefaultMaterial)
 
             for (let triangleIndex = 0; triangleIndex < mesh.TriangleCount (); triangleIndex++) {
                 let triangle = mesh.GetTriangle (triangleIndex);
-                if (triangle.n0 === null || triangle.n1 === null || triangle.n2 === null) {
+                if (!triangle.HasNormals ()) {
                     let n0 = AddAverageNormal (mesh, triangle, triangle.v0, triangleNormals, vertexToTriangles);
                     let n1 = AddAverageNormal (mesh, triangle, triangle.v1, triangleNormals, vertexToTriangles);
                     let n2 = AddAverageNormal (mesh, triangle, triangle.v2, triangleNormals, vertexToTriangles);