diff --git a/lib/core/engine.js b/lib/core/engine.js
index debc1bef..40a13c4e 100644
--- a/lib/core/engine.js
+++ b/lib/core/engine.js
@@ -134,10 +134,17 @@ class Engine {
   }
 
   pipelineService(_options) {
-    this.registerModule('pipeline', {plugins: this.plugins, env: this.env, webpackConfigName: this.webpackConfigName});
-    const pipeline = new Pipeline({
-    this.events.on('code-generator-ready', function () {
-        pipeline.build(abi, contractsJSON, null, () => {
+    const self = this;
+    this.registerModule('pipeline', {
+      webpackConfigName: this.webpackConfigName
+    });
+    this.events.on('code-generator-ready', function (modifiedAssets) {
+      self.events.request('code', function (abi, contractsJSON) {
+        self.events.request('pipeline:build', {abi, contractsJSON, modifiedAssets}, () => {
+          self.events.emit('outputDone');
+        });
+      });
+    });
   }
 
   serviceMonitor() {
diff --git a/lib/modules/blockchain_process/blockchain.js b/lib/modules/blockchain_process/blockchain.js
index 7ffe7f05..05538341 100644
--- a/lib/modules/blockchain_process/blockchain.js
+++ b/lib/modules/blockchain_process/blockchain.js
@@ -239,7 +239,7 @@ Blockchain.prototype.run = function () {
         }
         self.readyCallback();
       }
-      this.logger.info(`${self.client.name}: ${data}`);
+      self.logger.info(`${self.client.name}: ${data}`);
     });
 
     self.child.on('exit', (code) => {