Fix bug fix with unit ID