Re: [FIX] Dnd fixes