diff --git a/package.json b/package.json
index 4689113068d313c43d5753fce307cbecaefac53e..9c4be98a59dfc43a5d770b49ed5c6a8f9e75d8bf 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "@types/ws": "^4.0.1",
     "bl": "^1.2.0",
     "brolog": "^1.2.0",
-    "clone-class": "^0.4.1",
+    "clone-class": "^0.6.1",
     "cuid": "^2.1.1",
     "hot-import": "^0.1.0",
     "mime": "^2.2.0",
diff --git a/src/wechaty.ts b/src/wechaty.ts
index 8bfdfdc936c96069b8eca3a359b087a7e1b3cceb..17c7d0e12843feb497110ae509aa002a3b0426ae 100644
--- a/src/wechaty.ts
+++ b/src/wechaty.ts
@@ -22,8 +22,9 @@ import * as os      from 'os'
 import * as semver  from 'semver'
 
 import {
-  cloneClass,
   Constructor,
+  cloneClass,
+  instanceToClass,
 }                   from 'clone-class'
 import {
   callerResolve,
@@ -416,8 +417,7 @@ export class Wechaty extends PuppetAccessory implements Sayable {
       Message.puppet       = puppet
       Room.puppet          = puppet
 
-      ; // seperator
-      (this.constructor as any as PuppetAccessory).puppet = puppet
+      instanceToClass(this, Wechaty).puppet = puppet
     }
 
     /**