diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php
index 11e46082..dc853fbf 100644
--- a/PHPCI/Builder.php
+++ b/PHPCI/Builder.php
@@ -249,7 +249,7 @@ class Builder implements LoggerAwareInterface
 
         // The build is added to the context so the logger can use
         // details from it if required.
-        $context['build'] = $this;
+        $context['build'] = $this->build;
 
         foreach ($message as $item) {
             $this->logger->log($level, $item, $context);
diff --git a/PHPCI/Helper/LoggedBuildContextTidier.php b/PHPCI/Helper/LoggedBuildContextTidier.php
index 2a8a5e72..a67dd88d 100644
--- a/PHPCI/Helper/LoggedBuildContextTidier.php
+++ b/PHPCI/Helper/LoggedBuildContextTidier.php
@@ -2,9 +2,10 @@
 
 namespace PHPCI\Helper;
 
+use PHPCI\Model\Build;
 
-class LoggedBuildContextTidier{
-
+class LoggedBuildContextTidier
+{
     function __invoke()
     {
         return $this->tidyLoggedBuildContext(func_get_arg(0));