Fixed bug with select