additional Option handling tweak