bug: Fix dnd to fully work.