Fix dnd problem