#1040 - Skip logic always uses first option