Fix rapid drag and drop