[Fix #422] Workaround for multiple selects
Merge pull request #508 from theopolis/workaround_422

[Fix #422] Workaround for multiple selects