fix CLI selector behaviour
2.2.1