Combo UI - Bug Fix