Bootstrap version of #61 to close #60 (select)

The fix from #61 also needs to be applied to the bootstrap version.