diff --git a/client.js b/client.js
index 2f1c5199..5194da7c 100644
--- a/client.js
+++ b/client.js
@@ -279,7 +279,7 @@ CloudClient.Util        = (function(){
      * @pSrc_a ([String1, ..., StringN])
      * @pCallBack (functin)
      */
-    this.jsLoadOnLoad           = function (pSrc_a, pCallBack){
+    this.jsloadOnLoad           = function (pSrc_a, pCallBack){
         if( this.isArray(pSrc_a) ) {
             var n = pSrc_a.length;
             
@@ -289,7 +289,7 @@ CloudClient.Util        = (function(){
                     src : pSrc_a[i]
                 };
             
-            pSrc_a[n-1].func = pCallBack;
+            pSrc_a[0].func = pCallBack;
             
             this.anyLoadOnload(pSrc_a);
         }
diff --git a/lib/client/editor/_codemirror.js b/lib/client/editor/_codemirror.js
index 005b7c74..aee81cf0 100644
--- a/lib/client/editor/_codemirror.js
+++ b/lib/client/editor/_codemirror.js
@@ -60,11 +60,13 @@ var CloudCommander, CloudFunc, CodeMirror;
      * function loads CodeMirror js and css files 
      */
     function load(){
-        /* function loads css files of CodeMirror */
-        var loadAll = function() {
+        var lDir = CodeMirrorEditor.dir;
+        
+        /* function loads css files of CodeMirror */        
+        var loadAll = function() {                        
             Util.cssLoad([
-                { src : CodeMirrorEditor.dir + 'codemirror.css'},
-                { src : CodeMirrorEditor.dir + 'theme/night.css'}
+                { src : lDir + 'codemirror.css'},
+                { src : lDir + 'theme/night.css'}
             ]);
           
           
@@ -82,17 +84,16 @@ var CloudCommander, CloudFunc, CodeMirror;
                         //'#CodeMirrorEditor{'                                +
                         //    'padding        :20px 20px 20px 20px;'          +
                         //    '}'
-            });  
-                      
-            Util.jsload(CodeMirrorEditor.dir + 
-                'mode/javascript.js', function(){
-                        CodeMirrorLoaded = true;
-                        CodeMirrorEditor.show();
-                    });
+            });
+            
+            Util.jsload(lDir + 'mode/javascript.js', function(){
+                CodeMirrorLoaded = true;
+                CodeMirrorEditor.show();
+            });
         };
         
         /* load CodeMirror main module */
-        Util.jsload(CodeMirrorEditor.dir + 'codemirror.js', loadAll);
+        Util.jsload(lDir + 'codemirror.js', loadAll);
     }
         
      /**