diff --git a/src/core/core.coffee b/src/core/core.coffee
index 505a793..07f7ece 100644
--- a/src/core/core.coffee
+++ b/src/core/core.coffee
@@ -144,8 +144,8 @@ self.OS or=
     exit: ->
         #do clean up first
         f() for n, f of _OS.cleanupHandlers
-        _OS.cleanup()
         _API.handler.setting (r) ->
+            _OS.cleanup()
             _API.handler.logout()
     onexit: (n, f) ->
         self.OS.cleanupHandlers[n] = f unless self.OS.cleanupHandlers[n]
\ No newline at end of file