diff --git a/examples/viewer/viewer.cc b/examples/viewer/viewer.cc
index adb88b6..b5dc426 100644
--- a/examples/viewer/viewer.cc
+++ b/examples/viewer/viewer.cc
@@ -727,10 +727,6 @@ static void Draw(const std::vector<DrawObject>& drawObjects,
     glBindTexture(GL_TEXTURE_2D, 0);
   }
 
-  static bool bDrawWireFrame = false;
-  if (!bDrawWireFrame)
-	return;
-
   // draw wireframe
   glDisable(GL_POLYGON_OFFSET_FILL);
   glPolygonMode(GL_FRONT, GL_LINE);
diff --git a/tiny_obj_loader.h b/tiny_obj_loader.h
index 81e9f4f..1bf5718 100644
--- a/tiny_obj_loader.h
+++ b/tiny_obj_loader.h
@@ -1944,6 +1944,8 @@ bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
       }
 
       tags.push_back(tag);
+
+	  continue;
     }
 
 	if (token[0] == 's' && IS_SPACE(token[1])) {
@@ -1971,6 +1973,8 @@ bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
 	  shape.mesh.num_face_vertices.clear();
 	  shape.smoothingGroupId = smGroupId;
 	  currentSmoothingId = smGroupId;
+
+	  continue;
 	}	// smoothing group id
 
     // Ignore unknown command.