Minor logic update for DragDrop