Fix choose and chooseIfNotGiven logic
Merge pull request #914 from phvannor/dev

Fix choose and chooseIfNotGiven logic