diff --git a/CruiseControlNetServices/CruiseControlNetBuildStatus.cs b/CruiseControlNetServices/CruiseControlNetBuildStatus.cs
index 775ff9c8..10f460ad 100644
--- a/CruiseControlNetServices/CruiseControlNetBuildStatus.cs
+++ b/CruiseControlNetServices/CruiseControlNetBuildStatus.cs
@@ -76,12 +76,12 @@ public CruiseControlNetBuildStatus(XElement projectElem, XElement modifications)
             Url = string.Format("{0}/server/local/project/{1}/build/log{2}Lbuild.{3}.xml/ViewBuildReport.aspx", webUrl, Name, lastBuildTimeAsId, lastBuildNumber);
             BuildId = GetBuildIdOrDefault(projectElem, lastBuildTimeAsId);
 
-            if (BuildStatusEnum == SirenOfShame.Lib.Watcher.BuildStatusEnum.InProgress)
+            if (BuildStatusEnum == BuildStatusEnum.InProgress)
             {
-                Comment = "Building...";
+                Comment = null;
                 RequestedBy = null;
             }
-            else if (BuildStatusEnum == SirenOfShame.Lib.Watcher.BuildStatusEnum.Broken)
+            else if (BuildStatusEnum == BuildStatusEnum.Broken)
             {
                 Url = string.Format("{0}/server/local/project/{1}/build/log{2}.xml/ViewBuildReport.aspx", webUrl, Name, lastBuildTimeAsId);
                 BuildId = lastBuildTimeAsId;
diff --git a/SirenOfShame.Test.Unit/CIEntryPointBuildStatus/CruiseControlNetBuildStatusTest.cs b/SirenOfShame.Test.Unit/CIEntryPointBuildStatus/CruiseControlNetBuildStatusTest.cs
index c0bcdc21..065f5ec7 100644
--- a/SirenOfShame.Test.Unit/CIEntryPointBuildStatus/CruiseControlNetBuildStatusTest.cs
+++ b/SirenOfShame.Test.Unit/CIEntryPointBuildStatus/CruiseControlNetBuildStatusTest.cs
@@ -91,7 +91,7 @@ public void CruiseControlNetBuildStatus_ChangesToInProgress()
             Assert.AreEqual(DateTime.Now.ToString(), buildStatus.StartedTime.Value.ToString());
             Assert.IsNull(buildStatus.Comment);
             Assert.IsNull(buildStatus.FinishedTime);
-            Assert.AreEqual("http://VMXP/ccnet/server/local/project/CruiseControlNetProj1/build/log20110828202005.xml/ViewBuildReport.aspx", buildStatus.Url);
+            Assert.AreEqual("http://VMXP/ccnet/server/local/project/CruiseControlNetProj1/build/log20110828202005Lbuild.3.xml/ViewBuildReport.aspx", buildStatus.Url);
             Assert.AreEqual("3", buildStatus.BuildId);
         }