Fixed bug on select