Fixed firing onselect event