diff --git a/rowers/courses.py b/rowers/courses.py
index 1c2afa85..d3eab241 100644
--- a/rowers/courses.py
+++ b/rowers/courses.py
@@ -218,14 +218,14 @@ def get_polygons(polygonpms):
     return polygons
 
 def crewnerdify(polygons):
-    polygons[0].name = "Start"
-    polygons[len(polygons)-1].name = "Finish"
+    polygon_names = []
+    polygon_names.append("Start")
+    for i in range(1,len(polygons)-1):
+            polygon_name = 'WP{n}'.format(n=polygons[i].order_in_course)
+            polygon_names.append(polygon_name)
 
-    if len(polygons) > 2:
-        for i in range(1,len(polygons)-1):
-            polygons[i].name = 'WP{n}'.format(n=polygons[i].order_in_course)
-
-    return polygons
+    polygon_names.append("Finish")
+    return polygon_names
 
 def removewhitespace(s):
     regels = s.split('\n')
@@ -247,13 +247,16 @@ def getcoursefolder(course, document, cn=False):
     polygons = GeoPolygon.objects.filter(
         course=course).order_by("order_in_course")
 
+    polygon_names = [polygon.name for polygon in polygons]
     if cn:
-        polygons = crewnerdify(polygons)
+        polygon_names = crewnerdify(polygons)
 
-    for polygon in polygons:
+    for index, polygon in enumerate(polygons):
         placemark = SubElement(folder2, 'Placemark')
         polygonname = SubElement(placemark, 'name')
-        polygonname.text = polygon.name
+        polygonname.text = polygon_names[index]
+        polygondescription = SubElement(placemark, 'description')
+        polygondescription.text = polygon.name
         polygonstyle = SubElement(placemark, 'styleUrl')
         polygonstyle.text = "#default0"
         p = SubElement(placemark, 'Polygon')
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 48693760..a2f1b1b6 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ