Fix board selection bug