diff --git a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
index 4a183ff7702..7dbea47b59c 100755
--- a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
+++ b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
@@ -190,7 +190,7 @@ public class SwissTimingAdapterPersistenceImpl implements SwissTimingAdapterPers
         DBCollection races = database.getCollection(CollectionNames.RACES_MESSAGES.name());
         BasicDBObject query = new BasicDBObject();
         query.append(FieldNames.RACE_ID.name(), raceID);
-        query.append(FieldNames.MESSAGE_COMMAND.name(), "STL");
+        query.append(FieldNames.MESSAGE_COMMAND.name(), MessageType.STL.name());
         DBObject object = races.findOne(query);
         return object != null; 
     }
@@ -200,7 +200,7 @@ public class SwissTimingAdapterPersistenceImpl implements SwissTimingAdapterPers
         DBCollection races = database.getCollection(CollectionNames.RACES_MESSAGES.name());
         BasicDBObject query = new BasicDBObject();
         query.append(FieldNames.RACE_ID.name(), raceID);
-        query.append(FieldNames.MESSAGE_COMMAND.name(), "CCG");
+        query.append(FieldNames.MESSAGE_COMMAND.name(), MessageType.CCG.name());
         DBObject object = races.findOne(query);
         return object != null; 
     }
diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java
index 1451f9dd56b..02837a604cc 100755
--- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java
+++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java
@@ -619,7 +619,7 @@ public class SailMasterConnectorImpl extends SailMasterTransceiverImpl implement
     public boolean hasStartlist(String raceID) {
         boolean result = false;
         if (messageLoader != null) {
-            result = messageLoader.hasRaceCourse(raceID);
+            result = messageLoader.hasRaceStartlist(raceID);
         }
         return result;
     }