Fixed bug with selection options