option handling fixed