improve br/mc/uc check