Merged change from GitHub to fix notBest selection.
Merge branch 'JayH5-master'