diff --git a/mc-edit-lines.el b/mc-edit-lines.el
index d9e20cb..3303620 100644
--- a/mc-edit-lines.el
+++ b/mc-edit-lines.el
@@ -44,11 +44,13 @@ line point is on."
          (direction (if (< point-line mark-line) :up :down)))
     (deactivate-mark)
     (when (and (eq direction :up) (bolp))
-      (forward-line -1)
+      (previous-logical-line 1 nil)
       (move-to-column col))
     (while (not (eq (line-number-at-pos) point-line))
       (mc/create-fake-cursor-at-point)
-      (if (eq direction :up) (forward-line -1) (forward-line 1))
+      (if (eq direction :up)
+          (previous-logical-line 1 nil)
+        (next-logical-line 1 nil))
       (move-to-column col))
     (multiple-cursors-mode)))
 
diff --git a/multiple-cursors-core.el b/multiple-cursors-core.el
index 291fdf9..f0ab01c 100644
--- a/multiple-cursors-core.el
+++ b/multiple-cursors-core.el
@@ -130,7 +130,6 @@ highlights the entire width of the window."
                                   mark-ring
                                   mark-active
                                   yank-undo-function
-                                  kill-ring-yank-pointer
                                   autopair-action
                                   autopair-wrap-action
                                   er/history)