fix combo choice
new combo system