holoirc: fix some more corner case issue