Fix for some Drag & drop issues