Richard Boulton's patch for improved correctness in selection