#271 drag and drop working