Fixed chosen options thing
Handle weird values of current_value