Drag and drop: Hot fix