fix select bug, but not perfect soln
Merge https://github.com/ycswaves/yamatoV09