fix option handling inconsistency
5 files changed