Fixed bug with selecting already selected option