Updated SelectWrapper to more reliably work.