diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/MarkVectorGraphics.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/MarkVectorGraphics.java
index 38f7845a90b..f7ca991f49e 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/MarkVectorGraphics.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/MarkVectorGraphics.java
@@ -57,9 +57,9 @@ public class MarkVectorGraphics {
         switch(type) {
             case BUOY:
                 if(shape != null) {
-                    if("Cylinder".equalsIgnoreCase(shape) && pattern != null && "Checkered".equalsIgnoreCase(pattern)) {
+                    if(Shape.CYLINDER.name().equalsIgnoreCase(shape) && pattern != null && Pattern.CHECKERED.name().equalsIgnoreCase(pattern)) {
                         drawBuoyWithFinishFlag(ctx, isSelected, color);
-                    } else if ("Conical".equalsIgnoreCase(shape)) {
+                    } else if (Shape.CONICAL.name().equalsIgnoreCase(shape)) {
                         drawConicalBuoy(ctx, isSelected, color);
                     } else {
                         drawSimpleBuoy(ctx, isSelected, color);
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/Pattern.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/Pattern.java
new file mode 100644
index 00000000000..4e662d66e85
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/Pattern.java
@@ -0,0 +1,5 @@
+package com.sap.sailing.gwt.ui.shared.racemap;
+
+public enum Pattern {
+    CHECKERED
+}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/Shape.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/Shape.java
new file mode 100644
index 00000000000..5da42c05bff
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/Shape.java
@@ -0,0 +1,5 @@
+package com.sap.sailing.gwt.ui.shared.racemap;
+
+public enum Shape {
+    CYLINDER, CONICAL
+}