Corrected drag and drop