bug fix: fix DND issue