diff --git a/lib/ace/incremental_search_test.js b/lib/ace/incremental_search_test.js
index f47e6b4f..1d359a9a 100644
--- a/lib/ace/incremental_search_test.js
+++ b/lib/ace/incremental_search_test.js
@@ -40,10 +40,11 @@ var EditSession = require("./edit_session").EditSession;
 var Editor = require("./editor").Editor;
 var MockRenderer = require("./test/mockrenderer").MockRenderer;
 var Range = require("./range").Range;
-var MultiSelect = require("./multi_select").MultiSelect;
 var assert = require("./test/assertions");
 var IncrementalSearch = require("./incremental_search").IncrementalSearch;
 
+require("./multi_select");
+
 var editor, iSearch;
 function testRanges(str, ranges) {
     ranges = ranges || editor.selection.getAllRanges();
@@ -71,7 +72,6 @@ module.exports = {
     setUp: function() {
         var session = new EditSession(["abc123", "xyz124"]);
         editor = new Editor(new MockRenderer(), session);
-        new MultiSelect(editor);
         iSearch = new IncrementalSearch();
     },
 
diff --git a/lib/ace/keyboard/emacs.js b/lib/ace/keyboard/emacs.js
index 272071d1..674feaaa 100644
--- a/lib/ace/keyboard/emacs.js
+++ b/lib/ace/keyboard/emacs.js
@@ -444,7 +444,7 @@ exports.handler.addCommands({
             // in multi select mode, ea selection is handled individually
 
             if (args && args.count) {
-                if (editor.inMultiSelectMode) editor.forEachSelection({exec: moveToMark});
+                if (editor.inMultiSelectMode) editor.forEachSelection(moveToMark);
                 else moveToMark();
                 return;
             }