diff --git a/Sortable.js b/Sortable.js
index cac6f7115..f0c59b0ec 100644
--- a/Sortable.js
+++ b/Sortable.js
@@ -95,7 +95,7 @@
 					scrollEl = options.scroll;
 					scrollParentEl = rootEl;
 
-					if (scrollEl === true) {
+					if (scrollEl =_onDragOver== true) {
 						scrollEl = rootEl;
 
 						do {
@@ -606,7 +606,8 @@
 					else if (!canSort) {
 						rootEl.appendChild(dragEl);
 					}
-
+					//fix bug when cancel drag
+					parentEl = dragEl.parentNode;
 					return;
 				}