Fixing drag and drop.