Fixed combo box selection (fix #2)