diff --git a/lib/contracts/code_generator.js b/lib/contracts/code_generator.js
index b30807de..a00e6112 100644
--- a/lib/contracts/code_generator.js
+++ b/lib/contracts/code_generator.js
@@ -81,7 +81,7 @@ class CodeGenerator {
     });
 
     self.events.setCommandHandler('code-generator:contract', (contractName, cb) => {
-      self.events.setCommandHandler('contracts:contract', contractName, (contract) => {
+      self.events.request('contracts:contract', contractName, (contract) => {
         self.buildContractJS(contractName, self.generateContractJSON(contract, contract), cb);
       });
     });