Revert "fixing #344 reverting to old select behavior"

This reverts commit 099c31e3a91e4f405359a3d46f0abc35b2686194.