Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java	(revision 9371)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java	(revision 9400)
@@ -86,5 +86,6 @@
         waypoint.attr.put("sym", iconName);
         synchronized(LiveGpsLock.class) {
-            layer.data.add(new Marker(event.getCoordinates(), markerText, iconName));
+            //layer.data.add(new Marker(event.getCoordinates(), markerText, iconName));
+	    layer.data.add(new Marker(event.getCoordinates(), markerText, iconName, null, -1.0, 0.0));
             if(gpsLayer != null) {
                 gpsLayer.data.waypoints.add(waypoint);
@@ -105,5 +106,6 @@
             if(markerLayer == null) {
                 // not found, add a new one
-                markerLayer = new MarkerLayer(new GpxData(), MARKER_LAYER_NAME, null);
+                //markerLayer = new MarkerLayer(new GpxData(), MARKER_LAYER_NAME, null);
+		markerLayer = new MarkerLayer(new GpxData(), MARKER_LAYER_NAME, null, null);
                 Main.main.addLayer(markerLayer);
             }