*8727* Fix selector