diff --git a/src/components/AppDrag.vue b/src/components/AppDrag.vue
index 22f0cff..9ac2405 100644
--- a/src/components/AppDrag.vue
+++ b/src/components/AppDrag.vue
@@ -4,6 +4,7 @@
     @dragstart.self="onDrag"
     @dragover.prevent
     @dragenter.prevent
+    v-on="$listeners"
   >
     <slot/>
   </div>
diff --git a/src/mixins/movingTasksAndColumnsMixin.js b/src/mixins/movingTasksAndColumnsMixin.js
index 27e6d2b..8ac1517 100644
--- a/src/mixins/movingTasksAndColumnsMixin.js
+++ b/src/mixins/movingTasksAndColumnsMixin.js
@@ -23,12 +23,14 @@ export default {
     },
     moveTask ({ fromColumnIndex, fromTaskIndex }) {
       const fromTasks = this.board.columns[fromColumnIndex].tasks
+      const toTasks = this.board.columns[this.columnIndex].tasks
+      const toTaskIndex = this.taskIndex === undefined ? toTasks.length : this.taskIndex
 
       this.$store.commit('MOVE_TASK', {
         fromTasks,
+        toTasks,
         fromTaskIndex,
-        toTasks: this.column.tasks,
-        toTaskIndex: this.taskIndex
+        toTaskIndex
       })
     },
     moveColumn ({ fromColumnIndex }) {