Fixing drag and drop