Fix selector mess