diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/PassingInstruction.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/PassingInstruction.java
index af98544440b..e8c3c4903a5 100644
--- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/PassingInstruction.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/PassingInstruction.java
@@ -28,11 +28,18 @@ public enum PassingInstruction {
      * removed at any time!
      */
     public static PassingInstruction[] relevantValues() {
-        PassingInstruction[] uiValues = new PassingInstruction[PassingInstruction.values().length - 1];
-
+        final PassingInstruction[] uselessValues = new PassingInstruction[] { None, Single_Unknown };
+        PassingInstruction[] uiValues = new PassingInstruction[PassingInstruction.values().length - uselessValues.length];
         int i = 0;
         for (PassingInstruction p : PassingInstruction.values()) {
-            if (p != None && p != Single_Unknown) {
+            boolean useless = false;
+            for (PassingInstruction u : uselessValues) {
+                if (u == p) {
+                    useless = true;
+                    break;
+                }
+            }
+            if (!useless) {
                 uiValues[i++] = p;
             }
         }
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/CourseFragmentMarks.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/CourseFragmentMarks.java
index 4624fca74c0..85fa591c342 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/CourseFragmentMarks.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/CourseFragmentMarks.java
@@ -457,13 +457,17 @@ public class CourseFragmentMarks extends CourseFragment implements CourseMarkAda
         final CharSequence[] i18NPassingInstructions = getI18NPassingInstructions(passingInstructionsRelevantForUserEntry);
         builder.setTitle(R.string.pick_a_rounding_direction).setItems(i18NPassingInstructions, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int position) {
-                PassingInstruction pickedDirection = PassingInstruction.relevantValues()[position];
+                PassingInstruction pickedDirection = passingInstructionsRelevantForUserEntry[position];
                 onPassingInstructionPicked(courseElement, pickedDirection);
             }
         });
         builder.create().show();
     }
 
+    /**
+     * Cosntructs a message text for each of the {@link PassingIntsruction} values passed. The message strings
+     * returned correspond in their order with the {@link PassingInstruction}s passed in the array.
+     */
     private CharSequence[] getI18NPassingInstructions(PassingInstruction[] passingInstructionsRelevantForUserEntry) {
         final CharSequence[] result = new CharSequence[passingInstructionsRelevantForUserEntry.length];
         int i=0;