Tune up previous drag-and-drop commit