brand switcher bug fix