Fixed an issue with incorrect Drag and Drop behaviour