Fix bug with selected option