Fix skip-pivotal option logic