#450 better selector