added stop-at-first-non-option