pvt_selector is (hopefully) more robust